diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2012-05-10 17:20:56 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-10 17:20:56 +0900 |
| commit | bcb86e0adb6397013616567249d2d82f94b27891 (patch) | |
| tree | 706010a586caf52edb8b647a6ca7b84a66eeb259 /arch/sh/include/asm/processor.h | |
| parent | sh: Provide stubbed I/O routines for NO_IOPORT case. (diff) | |
| parent | watchdog: shwdt: Use finer grained clock control. (diff) | |
| parent | sh: Add pinmux for sh7269 (diff) | |
| download | linux-dev-bcb86e0adb6397013616567249d2d82f94b27891.tar.xz linux-dev-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>