Merge branch 'sched-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 20:01:34 +0000 (13:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 20:01:34 +0000 (13:01 -0700)
* 'sched-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  sched: Fix a memory leak in __sdt_free()
  sched: Move blk_schedule_flush_plug() out of __schedule()
  sched: Separate the scheduler entry for preemption

1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge