git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45ab6b0 30cb367 69b88af 8daa190)
Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 12:49:17 +0000 (13:49 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 12:49:24 +0000 (13:49 +0100)
We merge the irq/sparseirq, x86/quirks and x86/reboot trees into the
cpus4096 tree because the io-apic changes in the sparseirq change
conflict with the cpumask changes in the cpumask tree, and we
want to resolve those.


Trivial merge
Pandora Kernel Repository