summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-05-10 10:20:56 +0200
committerPaul Mundt <lethal@linux-sh.org>2012-05-10 10:20:56 +0200
commitbcb86e0adb6397013616567249d2d82f94b27891 (patch)
tree706010a586caf52edb8b647a6ca7b84a66eeb259 /arch/sh/boards
parentsh: Provide stubbed I/O routines for NO_IOPORT case. (diff)
parentwatchdog: shwdt: Use finer grained clock control. (diff)
parentsh: Add pinmux for sh7269 (diff)
downloadlinux-bcb86e0adb6397013616567249d2d82f94b27891.tar.xz
linux-bcb86e0adb6397013616567249d2d82f94b27891.zip
Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest
Conflicts: arch/sh/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>