]> 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: 8bd4bbb 79110aa)
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 07:03:33 +0000 (17:03 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 07:03:33 +0000 (17:03 +1000)
Conflicts:
include/net/9p/9p.h

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
Linux kernel for KaRo TX COM modules