]> 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, 7 Dec 2011 05:00:47 +0000 (16:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 05:00:47 +0000 (16:00 +1100)
commit47040b2bb1945b5dfc4fa7aa514743d0d51d5afa
tree9d75dca9e2551c96122801fc981cfee68164c93e
parent649e49612edd846a3c47489041c16e791708ee00
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