]> 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, 29 Nov 2011 03:26:25 +0000 (14:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 03:26:25 +0000 (14:26 +1100)
commit573e48ab13a0e70430c8ed53a836a62602152651
tree7b9710ffb4863eb48454f4c13c670896c30fc353
parent0a35e6f15987e2f662dd7760a53c4a34192198c4
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