Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest
authorPaul Mundt <lethal@linux-sh.org>
Thu, 10 May 2012 08:20:56 +0000 (17:20 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 10 May 2012 08:20:56 +0000 (17:20 +0900)
commitbcb86e0adb6397013616567249d2d82f94b27891
tree706010a586caf52edb8b647a6ca7b84a66eeb259
parentc5e50fa90ce42b1689692f587d4881308881b73d
parentd42c97443da5a542201f6cbaf793606877115d05
parentef0fa5331a73e479a30f73e00937afb5109566d7
Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest

Conflicts:
arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/Kconfig
arch/sh/boards/Kconfig
arch/sh/include/asm/processor.h
arch/sh/kernel/cpu/proc.c