summaryrefslogtreecommitdiffstats
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-24 10:36:16 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-24 10:36:16 -0700
commit8b97be054572fc769619184dcc174e280a5c851c (patch)
tree7f277be8c9bf393ae0fc253a979aaab62426deef /fs/nfsd
parent44d1b6dd3aa1651e1a9467a055a72c81eb96b8e3 (diff)
parent8bb7e27bbb9d0db7ca0e83d40810fb752381cdd5 (diff)
downloadlinux-8b97be054572fc769619184dcc174e280a5c851c.tar.gz
linux-8b97be054572fc769619184dcc174e280a5c851c.tar.bz2
linux-8b97be054572fc769619184dcc174e280a5c851c.zip
Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH: "Here are some fixes that poped up due to the big staging tree merge, as well as the removal of a staging driver that now is covered by a "real" driver. All of these have been in linux-next for a few days with no reported issues" * tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: delete STE RMI4 hackish driver staging: android: ion_test: fix check of platform_device_register_simple() error code staging: wilc1000: fix a couple of memory leaks staging: fsl-mc: fix incorrect type passed to dev_err macros staging: fsl-mc: fix incorrect type passed to dev_dbg macros staging: wilc1000: fixed kernel panic when firmware is not started staging: comedi: ni_mio_common: fix the ni_write[blw]() functions staging: most: hdm-dim2: Remove possible dereference error staging: lustre: checking for NULL instead of IS_ERR staging: lustre: really make lustre dependent on LNet staging: refresh TODO for rtl8712 staging: refresh TODO for rtl8723au
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions