]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'gfs2/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 02:01:20 +0000 (12:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 02:01:20 +0000 (12:01 +1000)
1  2 
MAINTAINERS
fs/gfs2/quota.c

diff --cc MAINTAINERS
Simple merge
diff --cc fs/gfs2/quota.c
Simple merge