aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-02 11:38:43 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-02 11:38:43 -0800
commit2273d5ccb882106a74c7b780a6bfa16fb210cd24 (patch)
tree229eaadb05940e8209cac36b0d8b0b4281d0bf08
parent5189fa19a4b2b4c3bec37c3a019d446148827717 (diff)
parent847854f5988a04fe7e02d2fdd4fa0df9f96360fe (diff)
parent5d85d97c9f6973ba854f35a2d5e80fe68272143e (diff)
parent8f2f748b0656257153bcf0941df8d6060acc5ca6 (diff)
downloadlinux-stericsson-2273d5ccb882106a74c7b780a6bfa16fb210cd24.tar.gz
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