]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 05:26:56 +0000 (16:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 05:26:56 +0000 (16:26 +1100)
commit3a0aa650ad9ab18fef5b5890e2e7b65749620da1
treef4d27eafabeabad2544fce39957f968c7072080a
parentff4c8ec731697aa0ebe90bf52428bbf5e7dd7949
parenta3b634032cadd0567aca93e8d60ad2fdd7402228
Merge remote-tracking branch 'kvmtool/master'

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