]> 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: c3f54df 7e05c93)
Merge remote-tracking branch 'namespace/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 05:40:42 +0000 (16:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 05:40:42 +0000 (16:40 +1100)
1  2 
fs/proc/inode.c patch | diff1 | diff2 | blob | history

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