]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'xen-tip/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 04:29:12 +0000 (15:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 04:29:12 +0000 (15:29 +1100)
commit2a6c7d4a6a6bff0a4f51706d12e06857f4ed685c
treef54182b351d1eebb9dcf122911cc8fcc23e45c80
parent307ed651c9912fb2672c5fe7300fa7826f460ae9
parent54d44eb3c7f6f893ae3b3cfb545145aa337976ca
Merge remote-tracking branch 'xen-tip/linux-next'

Conflicts:
arch/arm/include/asm/xen/page.h
arch/arm/include/asm/xen/page.h
drivers/block/xen-blkfront.c
drivers/char/tpm/xen-tpmfront.c
drivers/net/xen-netfront.c
drivers/pci/xen-pcifront.c
drivers/xen/Kconfig