Merge branch 'core/percpu' into x86/core
commit6a385db5ce7f1fd2c68ec511e44587b67dab8fca
authorIngo Molnar <mingo@elte.hu>
Wed, 28 Jan 2009 22:12:55 +0000 (28 23:12 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 28 Jan 2009 22:12:55 +0000 (28 23:12 +0100)
tree9324c8ae6f7be54b9fdbd6b60f759292aa727b1f
parent18e352e4a73465349711a9324767e1b2453383e2
parent4369f1fb7cd4cf777312f43e1cb9aa5504fc4125
Merge branch 'core/percpu' into x86/core

Conflicts:
kernel/irq/handle.c
kernel/irq/handle.c
kernel/irq/manage.c