diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 16:17:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-07 16:17:45 -0400 |
| commit | 27a3b735b70651f28db03e5f92775a40661ba7a6 (patch) | |
| tree | 9f300b93aa34381aa1d3121e9d53e8c8e1623a24 /arch/x86 | |
| parent | 85746e429f8e5dc8c5c0beadc0f099cb1feab93e (diff) | |
| parent | 161b6ae0e067e421b20bb35caf66bdb405c929ac (diff) | |
| parent | 140fe3b1ab9c082182ef13359fab4ddba95c24c3 (diff) | |
| parent | e4c2fb0d5776b58049d2556b456144a4db3fe5a9 (diff) | |
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