]> 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>
Wed, 5 Oct 2011 06:49:37 +0000 (17:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 06:49:37 +0000 (17:49 +1100)
commit369f54652602dc3efeea471134f153461a5bf926
tree9a0f15a10a671498bc927a09c03f824b3551eab1
parent363591c37dde4c68873edecdd04d9de36bc652b5
parenta3ff69a4704245a8de1fe5c3ee9906cbabbf58e1
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