Paul Mundt bcb86e0adb Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest ... Conflicts: arch/sh/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2012-05-10 17:20:56 +09:00
..
boards	Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest	2012-05-10 17:20:56 +09:00
boot	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
cchips	sh: Convert to new function names	2011-03-29 14:48:13 +02:00
configs	sh: Add RSK2+SH7269 board	2012-05-10 17:20:01 +09:00
drivers	sh: dma: Fix up device attribute mismatch from sysdev fallout.	2012-03-30 19:36:03 +09:00
include	Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest	2012-05-10 17:20:56 +09:00
kernel	Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest	2012-05-10 17:20:56 +09: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	Disintegrate asm/system.h for SH	2012-03-28 18:30:03 +01:00
mm	sh64: Kill off unused trap_no/error_code from thread_struct.	2012-04-19 17:52:20 +09:00
oprofile	oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue	2011-12-23 11:58:34 +01:00
tools	sh: Add RSK2+SH7269 board	2012-05-10 17:20:01 +09:00
Kconfig	Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest	2012-05-10 17:20:56 +09:00
Kconfig.cpu	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	sh: dwarf unwinder depends on SHcompact.	2012-03-30 19:31:22 +09:00
Makefile	sh: initial stack protector support.	2012-04-19 15:45:57 +09:00