]> 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>
Wed, 4 Apr 2012 02:25:23 +0000 (12:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 02:25:23 +0000 (12:25 +1000)
commitba8d50ec5dcfb3c21be52ed012f4d8a9f81b17b6
tree590ed5a5353437f2b6d51e93917c5d4b1610b1b5
parentaecfa53a6a432078449e0d199a5281b265ea4791
parent2faaa4d26209243da2338644ae764d950a4d1088
Merge remote-tracking branch 'xen-two/linux-next'

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