The following commit has been merged in the linux branch: commit d470c05bedc27dbd2df9d0bb6fd82336e4ff43db Merge: ee67e6cbe1121da1ae4eceb7b2bcb535c5cbf65e 457b646189e47f9d48588809da3e806ec363f219 Author: Linus Torvalds torvalds@linux-foundation.org Date: Wed Oct 14 15:30:45 2009 -0700

Merge branch 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'sh/for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Fix a TRACE_IRQS_OFF typo. sh: Optimize the setup_rt_frame() I-cache flush. sh: Populate initial secondary CPU info from boot_cpu_data. sh: Tidy up SMP cpuinfo. sh: Use boot_cpu_data for FPU tests in sigcontext paths. sh: ftrace: Fix up syscall tracepoint support. sh: force dcache flush if dcache_dirty bit set. sh: update die() output.