]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34202fa 7f73afe)
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 06:46:52 +0000 (17:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 06:46:52 +0000 (17:46 +1100)
commit53c998adb615ddc8b73d52b97bb45807b1f4dd5e
treea747921f06b5d4633057a5b72f0d03821b0e88a1tree | snapshot
parent34202fa6fa6d15d4efb6e935822f3ee30d79e312commit | diff
parent7f73afe6e9e5d63f4c29dd03b4686dd75d0aa646commit | 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