aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/prom/init_64.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-08 06:40:59 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-08 06:40:59 -0800
commit6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (patch)
tree0199e3ec8d3ad7799468f51d251b542192099777 /arch/sparc/prom/init_64.c
parentMerge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff)
parentx86/pvclock: Zero last_value on resume (diff)
parentperf record: Fix eternal wait for stillborn child (diff)
parentnohz: Fix printk_needs_cpu() return value on offline cpus (diff)
downloadlinux-dev-6313e3c21743cc88bb5bd8aa72948ee1e83937b6.tar.xz
linux-dev-6313e3c21743cc88bb5bd8aa72948ee1e83937b6.zip
Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/pvclock: Zero last_value on resume * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf record: Fix eternal wait for stillborn child perf header: Don't assume there's no attr info if no sample ids is provided perf symbols: Figure out start address of kernel map from kallsyms perf symbols: Fix kallsyms kernel/module map splitting * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: nohz: Fix printk_needs_cpu() return value on offline cpus printk: Fix wake_up_klogd() vs cpu hotplug