Orangefs: merge with V4.4
authorMike Marshall <hubcap@omnibond.com>
Fri, 15 Jan 2016 19:22:14 +0000 (14:22 -0500)
committerMike Marshall <hubcap@omnibond.com>
Fri, 15 Jan 2016 19:22:14 +0000 (14:22 -0500)
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current

Linux 4.4

1  2 
MAINTAINERS
fs/Kconfig

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