]> 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, 30 Nov 2011 03:51:44 +0000 (14:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 03:51:44 +0000 (14:51 +1100)
commit9b4a283cbf8087241fc105e85343198c647e2d66
treea3ce9b1f6e7b2ae95745894f8a8f9ae7ecfb43ef
parent1c075d63bd28c39661625b3d75118a939388a89e
parent321639325b09f90283e8bd0602e1c96829132c87
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
arch/arm/Kconfig
arch/hexagon/Kconfig
arch/m68k/Kconfig
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/x86/Kconfig
include/asm-generic/io.h
lib/Kconfig
lib/Makefile