]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'gfs2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Mar 2016 23:05:58 +0000 (10:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Mar 2016 23:05:58 +0000 (10:05 +1100)
1  2 
fs/gfs2/inode.c

diff --cc fs/gfs2/inode.c
Simple merge