linux-uconsole/arch/sh/kernel/cpu
Arnd Bergmann 426f1af947 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc
Conflicts:
	arch/arm/mach-shmobile/board-ap4evb.c

This moves the addition of init_consistent_dma_size() from the board
files into the common sh7372_map_io() functions where all the other
contents of the board specific map_io calls have gone.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-24 19:13:31 +00:00
..
irq sh: Convert to new function names 2011-03-29 14:48:13 +02:00
sh2 sh: sh2 sh_clk_ops rename 2012-03-12 22:19:10 +01:00
sh2a Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc 2012-03-24 19:13:31 +00:00
sh3 sh: sh3 sh_clk_ops rename 2012-03-12 22:19:11 +01:00
sh4 sh: sh4 sh_clk_ops rename 2012-03-12 22:19:11 +01:00
sh4a Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc 2012-03-24 19:13:31 +00:00
sh5 sh: sh5 sh_clk_ops rename 2012-03-12 22:19:12 +01:00
shmobile sh: cpuidle: Migrate off of hwblk API. 2011-11-18 16:13:09 +09:00
adc.c sh: Mass ctrl_in/outX to __raw_read/writeX conversion. 2010-01-26 12:58:40 +09:00
clock-cpg.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
fpu.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
init.c sh: Expose physical addressing mode through cpuinfo. 2010-10-26 14:44:58 +09:00
Makefile sh: hwblk: Kill off remaining bits of hwblk API. 2011-11-18 16:26:00 +09:00
proc.c sh: sh7372 SH4AL-DSP probe support 2011-01-13 15:20:40 +09:00