summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-02 20:38:43 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-02 20:38:43 +0100
commit2273d5ccb882106a74c7b780a6bfa16fb210cd24 (patch)
tree229eaadb05940e8209cac36b0d8b0b4281d0bf08 /kernel
parentregset: Return -EFAULT, not -EIO, on host-side memory fault (diff)
parentmemblock: Fix size aligning of memblock_alloc_base_nid() (diff)
parentMerge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentCPU hotplug, cpusets, suspend: Don't touch cpusets during suspend/resume (diff)
downloadlinux-2273d5ccb882106a74c7b780a6bfa16fb210cd24.tar.xz
linux-2273d5ccb882106a74c7b780a6bfa16fb210cd24.zip
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