]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 01:24:32 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 16 Nov 2011 01:24:32 +0000 (12:24 +1100)
commit0cd945a9bc988acc17197a7f2d5467ed273ce155
tree95db24123fd9bfdb181520926be6f2443281e3f1
parent59fba7bb687b18c501aebb5679172caf82ca186a
parentd4057557f848077a91c23a2bd0f5214a9378e02d
Merge remote-tracking branch 'kvmtool/master'

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