]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'gfs2/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 02:52:30 +0000 (13:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 02:52:30 +0000 (13:52 +1100)
1  2 
fs/gfs2/acl.c
fs/gfs2/quota.c

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