Paul Mundt f43dc23d5e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework ... Conflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h		2011-01-13 15:06:28 +09:00
..
Makefile	sh: Integrate the SH-5 onchip_remap() more coherently.	2009-05-07 18:10:27 +09:00
clock-sh5.c	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
entry.S	sh64: Fixup build breakage from breakpoint handler rename.	2010-01-19 15:58:27 +09:00
fpu.c	sh64: Use the shared FPU state restorer.	2010-01-19 15:55:27 +09:00
probe.c	sh: Tidy CPU probing and fixup section annotations.	2010-04-21 12:01:06 +09:00
setup-sh5.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework	2011-01-13 15:06:28 +09:00
switchto.S	sh: comment tidying for sh64->sh migration.	2008-01-28 13:18:58 +09:00
unwind.c	sh: replace remaining __FUNCTION__ occurrences	2008-03-06 11:18:22 +09:00