commit | e81b693c0104d6a767f998ee5a2e00b5acbbcd18 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 07 13:01:34 2011 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 07 13:01:34 2011 -0700 |
tree | fbf07b1d113be1d3f46ce1d0ca0e938b4e931f4d | |
parent | b0fb422281c8c09c8dcf03ca44ec343f0ff9df0b [diff] | |
parent | feff8fa0075bdfd43c841e9d689ed81adda988d6 [diff] |
Merge branch 'sched-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip * '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