]> 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, 6 Oct 2011 04:25:53 +0000 (15:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 04:25:53 +0000 (15:25 +1100)
commit878619479d2e0fbb9f5c78a9b125f08f1e49fc4a
tree630bf9d9bf52e241926cc6548c00c103bade11e5
parentb42054c402a8c61e15308ff49b0f5514c6030867
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