git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a38c538
f658bcf
)
Merge branch 'x86/amd-nb' into x86/apic-cleanups
author
Thomas Gleixner
<tglx@linutronix.de>
Thu, 9 Dec 2010 17:17:25 +0000
(18:17 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Thu, 9 Dec 2010 17:17:25 +0000
(18:17 +0100)
Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform
Conflicts:
arch/x86/include/asm/io_apic.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff