]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 05:02:38 +0000 (16:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 05:02:38 +0000 (16:02 +1100)
commit2d84e58a1117004e028fd8586bfc237911964912
treed6862505a1c7f637ed6f0703e388b4787396b8dc
parentd38ebb90a81c82ca77eef5bbe61f352f9a1684f0
parente1b4024a7ebf9d8235584d0d43f16cce9b8c0432
Merge remote-tracking branch 'kvmtool/master'

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