]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:58:35 +0000 (14:58 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:58:35 +0000 (14:58 +1100)
commit9b4325b546f95cbf862e97ea90bc1c99df04cd9d
tree0ab6a9b2f15f816ac3833d6928eba5b1ae4c2520
parent9b4a283cbf8087241fc105e85343198c647e2d66
parent1fbd119d2f9f1dd63c133868160a07c886b1ca40
Merge remote-tracking branch 'kvmtool/master'

Conflicts:
include/net/9p/9p.h
scripts/kconfig/Makefile
MAINTAINERS
arch/x86/Kconfig
scripts/kconfig/Makefile