Merge branch 'linus' into core/percpu
commitc43e0e46adf79c321ed3fbf0351e1005fb8a2413
authorIngo Molnar <mingo@elte.hu>
Fri, 30 Jan 2009 17:23:30 +0000 (30 18:23 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 30 Jan 2009 17:23:30 +0000 (30 18:23 +0100)
tree35b9ab361651f649d3c9aa69f159812eba50d154
parentdba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db
parentf2257b70b0f9b2fe8f2afd83fc6798dca75930b8
Merge branch 'linus' into core/percpu

Conflicts:
kernel/irq/handle.c
include/linux/sched.h
kernel/irq/handle.c
kernel/irq/manage.c