]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-two/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:39:02 +0000 (15:39 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 05:41:16 +0000 (15:41 +1000)
commit18fc875c4f9a3614b44c013da520cb77573b6361
tree9dbe5c19c1445b1985449dc84378a83f297433ee
parent9b2d291be6aac063bd028fc0c798d8dcdef65202
parent1f793bcdcdd65be777ab258dfcaa82c98d845765
Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/arm/Kconfig
arch/arm/mach-vexpress/Makefile.boot
drivers/xen/Makefile
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/dts/Makefile
arch/arm/mach-vexpress/v2m.c
drivers/net/xen-netfront.c
drivers/pci/xen-pcifront.c
drivers/xen/Makefile
drivers/xen/xen-pciback/pci_stub.c
include/xen/interface/physdev.h