From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Apr 2009 01:16:29 +0000 (-0700)
Subject: Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~14832
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d06be221504189f38950111c214802ada0eb1b71;p=kernel%2Fkernel-generic.git

Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Avoid printing sched_group::__cpu_power for default case
  tracing, sched: mark get_parent_ip() notrace
---

d06be221504189f38950111c214802ada0eb1b71