]> 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, 11 Oct 2011 07:15:30 +0000 (18:15 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 11 Oct 2011 07:15:30 +0000 (18:15 +1100)
commit1c2ab135d4b138abde8d4faa826cf63ad6c37773
tree18d545f4f4d9426175611db0e609c89648d5eeab
parent5c9ea3544936f2f0d8de00e9e5ae59267840ab55
parente54339ce6a3d094789ad74a78548799f2fddf521
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