Merge branch 'linus' into sched/urgent
commit251a169c69d1ff07cee7a9bb9fc4faff6b1d2ac3
authorIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 11:40:56 +0000 (11 13:40 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 11:40:56 +0000 (11 13:40 +0200)
tree3c20c3e080f276848f2ad67aadab44a5d64bfda9
parent6679ce6e5f519096612b480d255d9ca97be0c2be
parent796aadeb1b2db9b5d463946766c5bbfd7717158c
Merge branch 'linus' into sched/urgent
kernel/sched.c