]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:12:19 +0000 (17:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 06:12:19 +0000 (17:12 +1100)
commit2f1d1c7f8ac4f9f257b146d756a5dce2db4b7371
tree4e0e47fb23386e834f019357e7b06e724ab9a87e
parentd94e5a298da62e03fa6beb55417926b9bd765fba
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