]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'kvmtool/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 02:54:13 +0000 (13:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 14 Nov 2011 02:54:13 +0000 (13:54 +1100)
commite45f8b4fd08a9a1a7d0e8c632235d06b2920a999
tree3763f8293a798d510dd53dec4a6f7076165a23c5
parenta41771a47366b55173194a944e71796cdda8146c
parentef10d0bfc95f72bebd37a2ef7205bf2d1f68d162
Merge remote-tracking branch 'kvmtool/master'

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