diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:52:48 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:52:48 -0800 |
commit | b8bf17d311c875de02550d5ce2af66588734159a (patch) | |
tree | 82d829df77f3eb506d10928fd633a8a6e5685082 /arch/arm | |
parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | sched: Fix lockup by limiting load-balance retries on lock-break (diff) | |
download | linux-dev-b8bf17d311c875de02550d5ce2af66588734159a.tar.xz linux-dev-b8bf17d311c875de02550d5ce2af66588734159a.zip |
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
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions