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

..

boards

sh: board sh_clk_ops rename

2012-03-12 22:19:12 +01:00

boot

sh: kexec: Add PHYSICAL_START

2011-10-28 15:03:43 +09:00

cchips

sh: Convert to new function names

2011-03-29 14:48:13 +02:00

configs

sh: fix compile error using sh7757lcr_defconfig

2011-06-21 17:40:42 +09:00

drivers

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

2012-02-24 08:56:51 -08:00

include

sh: sh header sh_clk_ops rename

2012-03-12 22:19:10 +01:00

kernel

Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh into renesas/soc

2012-03-24 19:13:31 +00:00

lib

sh: Ensure ST40-300 BogoMIPS value is consistent

2011-02-15 16:24:05 +09:00

lib64

Fix common misspellings

2011-03-31 11:26:23 -03:00

math-emu

perf: Remove the nmi parameter from the swevent and overflow interface

2011-07-01 11:06:35 +02:00

mm

sh: Fix sh2a build error for CONFIG_CACHE_WRITETHROUGH

2012-02-24 13:21:46 +09:00

oprofile

oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue

2011-12-23 11:58:34 +01:00

tools

sh: Add support for AP-SH4AD-0A board.

2011-01-13 18:36:21 +09:00

Kconfig

sh: use the the PCI channels's io_map_base

2012-01-31 23:21:19 +02:00

Kconfig.cpu

sh: Turn on speculative return for SH7785 and SH7786

2010-02-18 18:54:18 +09:00

Kconfig.debug

lib: consolidate DEBUG_STACK_USAGE option

2011-05-25 08:39:54 -07:00

Makefile

sh: Add default uImage rule for sh7757lcr

2011-11-01 16:01:12 +09:00