]> 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, 27 Sep 2011 05:40:06 +0000 (15:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 05:40:06 +0000 (15:40 +1000)
commit016cefba253e3e63bd34b9645ea423406263799a
treeb78638014ea4e23478537024a9a56169d1e89bd2
parent3aff563f0edb156536a096e0ccf58749053c18db
parent5e06dd551432a6da4b738100664955c119b47a55
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