commit 27a3b735b70651f28db03e5f92775a40661ba7a6
author Linus Torvalds <torvalds@linux-foundation.org> Thu Jul 07 13:17:45 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Jul 07 13:17:45 2011 -0700
tree 9f300b93aa34381aa1d3121e9d53e8c8e1623a24
parent 85746e429f8e5dc8c5c0beadc0f099cb1feab93e
parent 161b6ae0e067e421b20bb35caf66bdb405c929ac
parent 140fe3b1ab9c082182ef13359fab4ddba95c24c3
parent e4c2fb0d5776b58049d2556b456144a4db3fe5a9

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