From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 18 Dec 2007 16:11:01 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
X-Git-Tag: v2.6.24-rc6~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=51dad801e271f3754a728e5b9a2ef974576490cc;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: do not hurt SCHED_BATCH on wakeup
  sched: touch softlockup watchdog after idling
  sched: sysctl, proc_dointvec_minmax() expects int values for
  sched: mark rwsem functions as __sched for wchan/profiling
  sched: fix crash on ia64, introduce task_current()
---

51dad801e271f3754a728e5b9a2ef974576490cc