From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Sep 2011 20:01:34 +0000 (-0700)
Subject: Merge branch 'sched-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~16541
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e81b693c0104d6a767f998ee5a2e00b5acbbcd18;p=mirror_ubuntu-artful-kernel.git

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
---

e81b693c0104d6a767f998ee5a2e00b5acbbcd18