]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0346f5 2faaa4d)
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)
Conflicts:
arch/x86/include/asm/io_apic.h
arch/x86/kernel/apic/io_apic.c


Trivial merge
Linux kernel for KaRo TX COM modules