]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb4f96f 4eb15a3)
Merge remote-tracking branch 'gfs2/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 04:04:04 +0000 (14:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Sep 2011 04:04:04 +0000 (14:04 +1000)
1  2 
fs/gfs2/acl.c patch | diff1 | diff2 | blob | history

diff --cc fs/gfs2/acl.c
Simple merge
Linux kernel for KaRo TX COM modules