]> 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>
Tue, 4 Oct 2011 05:22:44 +0000 (16:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 05:22:44 +0000 (16:22 +1100)
commit7fe3b1e7610b8abffe45da6dabcbc04c49034a83
treee8e22c7baf1b5b7eb36d8ab689904f0bb970b6f1
parentb805ae8a3e1eb6104e909626d27e31321bed82ed
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