]> 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, 17 Apr 2012 03:02:09 +0000 (13:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 03:02:09 +0000 (13:02 +1000)
commit957e797416ebd19f04ebe24081d37104e3dbc725
tree39a75cd4a47700924f28424e6e0c8eb154228a50
parent790a30d62b8764c35cc18573cb29192caf0c58b2
parent2efe928d9f721fb54f7bef90dbf37cbd9a68f48b
Merge remote-tracking branch 'xen-two/linux-next'

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