]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 05:37:29 +0000 (16:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 05:37:29 +0000 (16:37 +1100)
commit5953d2de5c73087a515ab2e9dab96ec35b427bcd
tree9eb6730be17f550224dabab4cce9993e6fa45e80
parent099be4698c8e13e3821e44c5f238dc27459dc346
parentf9f09f7c33bfa2f9c2115105d501f566912a37e1
Merge remote-tracking branch 'kvmtool/master'

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