]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:54:29 +0000 (15:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 04:54:29 +0000 (15:54 +1100)
commit2edfce475a890d62675713d585f466c5dd81a537
tree7dd191d61c260d459ef22c57894e2a64df4d3ea7
parent98da86c3743eb76520ac024d3bc6c8834ce9eba2
parent04429c8388be4a297f33ec04d7690647d4108938
Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/x86/xen/Kconfig
arch/x86/xen/Kconfig
arch/x86/xen/mmu.c
drivers/block/xen-blkback/common.h
drivers/xen/xen-pciback/xenbus.c