Paul Mundt ee8365f233 Merge branch 'master' into sh/cachetlb ... Conflicts: arch/sh/kernel/Makefile_64		2009-08-19 09:12:00 +09:00
..
clock-sh7619.c	sh: clkfwk: Add a followparent_recalc() helper.	2009-05-12 03:50:44 +09:00
entry.S	sh: Make sure rte delay slots are nopped out on all parts.	2009-08-15 07:41:45 +09:00
ex.S
Makefile
probe.c	sh: Track the CPU family in sh_cpuinfo.	2009-08-15 10:48:13 +09:00
setup-sh7619.c	sh: convert processor device setup functions to arch_initcall()	2009-07-23 13:06:07 +09:00