Merge branch 'linus' into core/softirq
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:23:59 +0000 (12:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:23:59 +0000 (12:23 +0200)
commitace7f1b79670aa0c1d9f4b0442be82e565827333
treeed4625a9cbc8e28db2b1ff9fad111c4c012508a3
parenta60b33cf59d1c9e0e363287fce799cb23d45660c
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
Merge branch 'linus' into core/softirq
kernel/sched.c