]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 07:27:58 +0000 (18:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 07:27:58 +0000 (18:27 +1100)
commitb07f04fd51346e4d8d4200be285c0229c2f1842d
treea1d00ac1983c51246c4b1605cb7d9ccb20564eab
parentba6d156d9e2325ac56cbee5d4385454cd46150f6
parent8a89322715d349920afb2ab9bf01949f09ee50db
Merge remote-tracking branch 'kvmtool/master'

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