]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:34:53 +0000 (17:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:34:53 +0000 (17:34 +1100)
commit4753e2966939661407dde691e6aafb13fed96cbc
treeafd43ac40366bfba17f1c2bffe8c622bc07c7413
parent11f40c27a823293d90331492f549d1288b4b86b4
parentc5fa2dfd9e563e21be0174e884680a95ef5aec7e
Merge remote-tracking branch 'kvmtool/master'

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