]> 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, 29 Sep 2011 04:57:17 +0000 (14:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 04:57:17 +0000 (14:57 +1000)
commitba05fe58ae3460df569b4d47004e4071d6cb0907
tree491d22510abd88c6f1a940ca99ea74aff90f6fb9
parent015afc9868ca1bc8a3c71a3746b2b8d01f78b589
parent5e06dd551432a6da4b738100664955c119b47a55
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