]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 03:33:05 +0000 (14:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 03:33:05 +0000 (14:33 +1100)
commita9fd5bfbc9b6388e25275809d704ce056ce3e86b
treeb6133a629c61e29f92241b186538fba1eb39c07e
parent573e48ab13a0e70430c8ed53a836a62602152651
parent870a88b23331118c7999451a7f5601de517251f2
Merge remote-tracking branch 'kvmtool/master'

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