]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 04:13:01 +0000 (15:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 04:13:01 +0000 (15:13 +1100)
commit3d92dea90ae94504cdf35d8e68af80e55c7f92e7
treee6052c9003f0fe3d3bf5b7a558d19a86312bd53e
parent201d17ae8b748743bf2e4690567783d9ef1f5370
parenta048466f4945ef7deea9dc03c0d637446a093345
Merge remote-tracking branch 'kvmtool/master'

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