tree 229eaadb05940e8209cac36b0d8b0b4281d0bf08
parent 5189fa19a4b2b4c3bec37c3a019d446148827717
parent 847854f5988a04fe7e02d2fdd4fa0df9f96360fe
parent 5d85d97c9f6973ba854f35a2d5e80fe68272143e
parent 8f2f748b0656257153bcf0941df8d6060acc5ca6
author Linus Torvalds <torvalds@linux-foundation.org> 1330717123 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1330717123 -0800

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/tip

Pulling latest branches from Ingo:

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  memblock: Fix size aligning of memblock_alloc_base_nid()

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf probe: Ensure offset provided is not greater than function length without DWARF info too
  perf tools: Ensure comm string is properly terminated
  perf probe: Ensure offset provided is not greater than function length
  perf evlist: Return first evsel for non-sample event on old kernel
  perf/hwbp: Fix a possible memory leak

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  CPU hotplug, cpusets, suspend: Don't touch cpusets during suspend/resume