]> 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>
Mon, 2 Apr 2012 02:48:41 +0000 (12:48 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 02:48:41 +0000 (12:48 +1000)
commita512aa6a13db036ee2443187b5e7edda9fc113bd
tree1396c8897e4a184fe8dfebebbdcddc74330be7f4
parentc0346f5452f16009f5d49ab4a820b1c16ca76e30
parent2faaa4d26209243da2338644ae764d950a4d1088
Merge remote-tracking branch 'xen-two/linux-next'

Conflicts:
arch/x86/include/asm/io_apic.h
arch/x86/kernel/apic/io_apic.c