]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jul 2011 20:17:45 +0000 (13:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Jul 2011 20:17:45 +0000 (13:17 -0700)
commitd840c44944300e06a48653ccc15b076096f13b9d
tree9f300b93aa34381aa1d3121e9d53e8c8e1623a24
parent110572578926d9f11c511c08cc7764d3be27917d
parent5c887106508c28cad4b474bd06a9eb59fda1167f
parent163777abdffb3085ed550e44c72180aff3993c30
parentb49cc93c74df9f6b4304a1dc1ebd24f189f08f9b
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