2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
linux-next/arch/arm/mach-shmobile
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
..
include/mach ARM: mach-shmobile: update for GIC changes. 2011-01-07 12:02:11 +09:00
board-ag5evm.c ARM: mach-shmobile: Run-time IRQ handler for GIC 2011-01-07 10:42:56 +09:00
board-ap4evb.c ARM: mach-shmobile: Run-time IRQ handler for INTCA 2011-01-07 10:42:50 +09:00
board-g3evm.c ARM: mach-shmobile: Run-time IRQ handler for INTCA 2011-01-07 10:42:50 +09:00
board-g4evm.c ARM: mach-shmobile: Run-time IRQ handler for INTCA 2011-01-07 10:42:50 +09:00
board-mackerel.c ARM: mach-shmobile: Run-time IRQ handler for INTCA 2011-01-07 10:42:50 +09:00
clock-sh73a0.c ARM: mach-shmobile: Fix up clkdev fallout for SH73A0. 2011-01-07 11:49:49 +09:00
clock-sh7367.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock-sh7372.c Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-01-06 16:50:35 -08:00
clock-sh7377.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.c ARM: mach-shmobile: Clock framework comment fix 2010-08-18 16:31:00 +09:00
console.c
entry-gic.S ARM: mach-shmobile: update for GIC changes. 2011-01-07 12:02:11 +09:00
entry-intc.S ARM: mach-shmobile: Run-time IRQ handler for INTCA 2011-01-07 10:42:50 +09:00
headsmp.S ARM: mach-shmobile: Clean up headsmp.S 2010-12-21 00:27:41 +09:00
hotplug.c ARM: mach-shmobile: SMP base support 2010-12-14 18:15:44 +09:00
intc-sh73a0.c ARM: mach-shmobile: update for GIC changes. 2011-01-07 12:02:11 +09:00
intc-sh7367.c
intc-sh7372.c ARM: mach-shmobile: intc-sh7372: fix interrupt number 2010-11-08 13:48:50 +09:00
intc-sh7377.c
Kconfig Merge branch 'smp' into misc 2011-01-06 22:32:03 +00:00
localtimer.c ARM: mach-shmobile: SMP base support 2010-12-14 18:15:44 +09:00
Makefile Merge branch 'rmobile/smp' into rmobile-latest 2011-01-07 10:51:35 +09:00
Makefile.boot
pfc-sh73a0.c ARM: mach-shmobile: sh73a0 GPIO pullup improvement 2010-12-22 16:35:50 +09:00
pfc-sh7367.c
pfc-sh7372.c ARM: mach-shmobile: pfc-sh7372: modify wrong comment 2010-09-14 17:20:13 +09:00
pfc-sh7377.c
platsmp.c ARM: mach-shmobile: update for SMP changes. 2011-01-07 12:03:22 +09:00
pm_runtime.c
setup-sh73a0.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
setup-sh7367.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
setup-sh7372.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
setup-sh7377.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
smp-sh73a0.c ARM: mach-shmobile: update for GIC changes. 2011-01-07 12:02:11 +09:00
timer.c