]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'tmem/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 03:40:54 +0000 (14:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 03:40:54 +0000 (14:40 +1100)
commitec363ccb2c430e830eab25e9831d1a28ade1f061
treeb8a8c289c055565fd78596f0a7c7991347ce9081
parent390485675b6a85f0cdb4e334fbc7dbd9ce8094b4
parenta728d5ea1c20adbc4997287d8f17c528bda7ce8c
Merge remote-tracking branch 'tmem/linux-next'

Conflicts:
arch/x86/include/asm/xen/interface.h
arch/x86/xen/setup.c
arch/x86/xen/smp.c
drivers/xen/cpu_hotplug.c
arch/x86/include/asm/xen/interface.h
include/xen/interface/xen.h
include/xen/xen.h