]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 05:14:49 +0000 (16:14 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 05:14:49 +0000 (16:14 +1100)
commitb2556bad3b5f72c3b5b4e42641ae8eca911e03f6
treebe558ac6b5919062c3835c892f2eaa10d37b27cc
parentd706b7298fdc2ca2fb7f899d23ac9f965e44319b
parent193a667fba76b3df482cbf865228e26ee246e889
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
14 files changed:
arch/alpha/kernel/pci.c
arch/arm/Kconfig
arch/frv/Kconfig
arch/hexagon/Kconfig
arch/m68k/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/sh/drivers/pci/pci.c
arch/tile/include/asm/pci.h
arch/tile/kernel/pci.c
arch/x86/Kconfig
include/asm-generic/io.h
lib/Kconfig
lib/Makefile