]> 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, 2 Dec 2011 02:56:47 +0000 (13:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 02:56:47 +0000 (13:56 +1100)
commitdb50c1ccc5e3515e7447a829c7556be01a6ee9ea
tree1f0652ff1409c93bc9d2c007014877533f7817fb
parent7d7557b444876e9addd70ae000d2e39297b12ea8
parentd398a2f52049dceb07e18485acf28f93f4607ce7
Merge remote-tracking branch 'vhost/linux-next'

Conflicts:
arch/hexagon/Kconfig
arch/m68k/Kconfig
arch/arm/Kconfig
arch/frv/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