Merge remote-tracking branch 'orangefs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:15:20 +0000 (11:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 00:15:20 +0000 (11:15 +1100)
1  2 
fs/Makefile

diff --cc fs/Makefile
Simple merge