Orangefs: merge to v4.5
authorMike Marshall <hubcap@omnibond.com>
Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
committerMike Marshall <hubcap@omnibond.com>
Mon, 14 Mar 2016 19:39:42 +0000 (15:39 -0400)
Merge tag 'v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current

Linux 4.5

1  2 
MAINTAINERS
fs/Kconfig

diff --cc MAINTAINERS
Simple merge
diff --cc fs/Kconfig
Simple merge