diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 22:17:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 22:17:45 +0200 |
| commit | 27a3b735b70651f28db03e5f92775a40661ba7a6 (patch) | |
| tree | 9f300b93aa34381aa1d3121e9d53e8c8e1623a24 /kernel | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | debugobjects: Fix boot crash when kmemleak and debugobjects enabled (diff) | |
| parent | jump_label: Fix jump_label update for modules (diff) | |
| parent | sched: Disable (revert) SCHED_LOAD_SCALE increase (diff) | |
| download | linux-27a3b735b70651f28db03e5f92775a40661ba7a6.tar.xz linux-27a3b735b70651f28db03e5f92775a40661ba7a6.zip | |
Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
debugobjects: Fix boot crash when kmemleak and debugobjects enabled
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
jump_label: Fix jump_label update for modules
oprofile, x86: Fix race in nmi handler while starting counters
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Disable (revert) SCHED_LOAD_SCALE increase
sched, cgroups: Fix MIN_SHARES on 64-bit boxen