]> 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>
Fri, 23 Sep 2011 04:21:13 +0000 (14:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 04:21:13 +0000 (14:21 +1000)
commit429e0df2dbf7fca3e4e6278bc466116a907c247d
tree379d73867d0d644f1994708a354262147361570a
parentcbd4e628aeaadca677068eadea1883da8aee379c
parentd908fddf0c8db6b1d160de614ef8cbb546bb5b40
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/block/xen-blkback/xenbus.c