]> 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, 30 Sep 2011 03:28:21 +0000 (13:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 03:28:21 +0000 (13:28 +1000)
commitf68c73d12739aac45fc996f42641b860fe997479
tree2837b7cc41f3efae8a9306dcd7eae5cb66925a76
parent2649fe9df093167c774f9d70aa3f7f6d0a0362e8
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