aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-05 20:33:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-05 20:33:10 -0700
commitbd779669945ed9982890da789ad32e3bd0d41f14 (patch)
tree533868e890b6ff2751abf5c4072c105e25e4a4eb /init/Kconfig
parentMerge tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff)
parent9p: fix return code of read() when count is 0 (diff)
downloadlinux-dev-bd779669945ed9982890da789ad32e3bd0d41f14.tar.xz
linux-dev-bd779669945ed9982890da789ad32e3bd0d41f14.zip
Merge tag 'for-linus-4.3-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p updates from Eric Van Hensbergen: "Just a few cleanups for 4.3 merge window for the 9p file system. I've gotten several more over the past week, but this group has been in for-next for at least a couple of weeks so I figured I'd push them first while I test the rest. Most of the ones not in this set are bug-fixes anyways so I could hold them for rc1" * tag 'for-linus-4.3-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: fix return code of read() when count is 0 9p: remove unused option Opt_trans
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions