Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 19 Nov 2008 08:44:37 +0000 (09:44 +0100)
Conflicts:
kernel/Makefile


Trivial merge