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

diff --cc fs/dax.c
Simple merge