]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 04:45:04 +0000 (15:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 04:45:04 +0000 (15:45 +1100)
commit9d17db7410a7411991dbb9f8b4a4e6db5ae31bc2
treed84a93e6b7f065837b52918ec6a7f54440eadefe
parent76be06d478bb7858e4ce8b0a0ce55d211b9be828
parenteff4e9264d6e31044ef9b0989ea112acbefe0dc3
Merge remote-tracking branch 'kvmtool/master'

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