]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'vhost/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 04:20:53 +0000 (15:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 04:20:53 +0000 (15:20 +1100)
commit42262d5646b2b8e1d0d010ca7a82ed111d18a0a9
tree793f7621d0469d940bf25a2a7a58bc516cf47866
parentfae29487bc65d01b310177051219fe10d60b202e
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