tree 82d829df77f3eb506d10928fd633a8a6e5685082
parent 9fc5c3e3237e02a94f41cd1d2b4291593d29791d
parent bced76aeaca03b45e3b4bdb868cada328e497847
author Linus Torvalds <torvalds@linux-foundation.org> 1326351168 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326351168 -0800

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix lockup by limiting load-balance retries on lock-break
  sched: Fix CONFIG_CGROUP_SCHED dependency
  sched: Remove empty #ifdefs