]> 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>
Mon, 26 Sep 2011 06:20:32 +0000 (16:20 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 06:20:32 +0000 (16:20 +1000)
commit24251a11899fee593de38494f966be821541ee5b
tree0797ef1daf0766f87705f3e758f22bfe42f5eabe
parent7ecd3ac9994fefb61788a97370e7262b363b52f3
parent10e2d46f155006e21e0a4ed44f1dbad836aed9ec
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