]> 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>
Fri, 14 Oct 2011 04:59:14 +0000 (15:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 04:59:14 +0000 (15:59 +1100)
commit86242859b04e01f2b8e07d66f1fc2d22aedd68c3
treeb5d3df80396850798be4d992f88fa1054db67298
parent3e7d7a4f76199daf654e7be79dae479deeccae26
parent81e78e6c5ebd9a8ddd123fd0e8d0557aac93a8d1
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/net/xen-netback/netback.c
drivers/xen/xen-pciback/xenbus.c