]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d0adcc4 efc07c3)
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 04:50:18 +0000 (14:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 04:50:18 +0000 (14:50 +1000)
commit8de4587017fb41d5d61ad331f864e980a838904d
treeab64502dafc3bc7d01da704d6d257918810a167dtree | snapshot
parentd0adcc483999a4997510128d49ca207d844f15bacommit | diff
parentefc07c3577f2a623df07a74eb3923efb9ef1cadbcommit | diff
Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h
MAINTAINERS diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules