]> 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, 12 Oct 2011 05:00:43 +0000 (16:00 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 05:00:43 +0000 (16:00 +1100)
commit198c659f6a9df7bb91cacc517aa72ca4ccaeea97
treef7464e2395a64d2653eeb9e4f9bce9b6eb9efca5
parenta407833f1b4ece71eab1c2d00de9e54430fae7e8
parent9fda08fac20480d18a27daed4ff3ff995a7cbc11
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