lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
b2f1df8d2f
linux-kernel-test/arch/arm/mach-shmobile
History
Arnd Bergmann b2f1df8d2f Merge branch 'renesas/timer' into next/timer 
Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 09:41:43 +00:00
..
include/mach Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00
board-ag5evm.c Merge branch 'renesas/fixes' into renesas/soc 2012-03-15 17:33:38 +00:00
board-ap4evb.c Merge branch 'renesas/fixes' into renesas/soc 2012-03-15 17:33:38 +00:00
board-bonito.c Merge branch 'renesas/fixes' into renesas/soc 2012-03-15 17:33:38 +00:00
board-g3evm.c ARM: mach-shmobile: sh7367 and G3EVM timer rework 2012-03-12 22:19:44 +01:00
board-g4evm.c ARM: mach-shmobile: sh7377 and G4EVM timer rework 2012-03-12 22:19:44 +01:00
board-kota2.c ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework 2012-03-12 22:19:45 +01:00
board-mackerel.c Merge branch 'renesas/fixes' into renesas/soc 2012-03-15 17:33:38 +00:00
board-marzen.c ARM: mach-shmobile: r8a7779 and Marzen timer rework 2012-03-12 22:19:46 +01:00
clock-r8a7740.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-r8a7779.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh73a0.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7367.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7372.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock-sh7377.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
clock.c ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() 2012-03-12 22:19:43 +01:00
console.c
cpuidle.c
entry-intc.S
headsmp.S ARM: mach-shmobile: Fix headsmp.S code to use CPUINIT 2012-01-09 10:36:48 +09:00
hotplug.c ARM: mach-shmobile: Flush caches in platform_cpu_die() 2012-01-09 10:37:29 +09:00
intc-r8a7740.c ARM: mach-shmobile: r8a7740: add INTC support 2011-11-11 16:55:37 +09:00
intc-r8a7779.c ARM: mach-shmobile: r8a7779 and Marzen base support V2 2012-01-09 10:13:59 +09:00
intc-sh73a0.c ARM: mach-shmobile: sh73a0 IRQ sparse alloc fix 2012-01-18 10:12:56 +10:00
intc-sh7367.c
intc-sh7372.c PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume 2011-12-25 23:39:11 +01:00
intc-sh7377.c
Kconfig Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest 2012-01-10 17:10:55 +09:00
Makefile ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
Makefile.boot
pfc-r8a7740.c
pfc-r8a7779.c ARM: mach-shmobile: r8a7779 PFC IPSR4 fix 2012-02-24 13:24:59 +09:00
pfc-sh73a0.c
pfc-sh7367.c
pfc-sh7372.c ARM: mach-shmobile: add GPIO-to-IRQ translation to sh7372 2012-01-24 10:40:25 +09:00
pfc-sh7377.c
platsmp.c ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
pm-r8a7779.c ARM: mach-shmobile: r8a7779 SMP support V3 2012-01-12 11:00:27 +09:00
pm-sh7372.c PM / shmobile: fix A3SP suspend method 2012-01-14 00:40:14 +01:00
setup-r8a7740.c ARM: mach-shmobile: r8a7740 and Bonito timer rework 2012-03-12 22:19:45 +01:00
setup-r8a7779.c ARM: shmobile: remove additional __io() macro use 2012-03-14 01:05:42 +01:00
setup-sh73a0.c ARM: mach-shmobile: sh73a0, AG5EVM and Kota2 timer rework 2012-03-12 22:19:45 +01:00
setup-sh7367.c ARM: mach-shmobile: sh7367 and G3EVM timer rework 2012-03-12 22:19:44 +01:00
setup-sh7372.c ARM: mach-shmobile: sh7372, AP4EVB and Mackerel timer rework 2012-03-12 22:19:45 +01:00
setup-sh7377.c ARM: mach-shmobile: sh7377 and G4EVM timer rework 2012-03-12 22:19:44 +01:00
sleep-sh7372.S PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode 2011-12-25 23:39:03 +01:00
smp-r8a7779.c ARM: shmobile: convert to twd_local_timer_register() interface 2012-03-13 13:30:31 +00:00
smp-sh73a0.c Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00
suspend.c
timer.c Merge branch 'renesas/timer' into next/timer 2012-03-20 09:41:43 +00:00