]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 06:28:07 +0000 (17:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 06:28:07 +0000 (17:28 +1100)
commit836e67815b75b688cdcb0f9ac99141ed6855abfa
tree797a136f139b09a6536d4e6f07ec6af0c6d35ff5
parente032e8c6de28dd128d304f8d796b3242ac5b3b1f
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