Merge branch 'sched-cfs'v2.6.24-rc5-zen0
commit27a49c35d074c5cb333d0232d0f1b6e7ff74b546
authorMiguel Botón <mboton@gmail.com>
Tue, 11 Dec 2007 21:44:29 +0000 (11 22:44 +0100)
committerMiguel Botón <mboton@gmail.com>
Tue, 11 Dec 2007 21:44:29 +0000 (11 22:44 +0100)
tree414571295f6606b093b32129ad0e793e59303c6f
parent69920585a9563462f7306281a50ec4cff4ed4c4b
parent0016cae48b5c2f3ceeaa3ff4f6b9fee22d153285
Merge branch 'sched-cfs'
kernel/sched.c