| commit | bcb86e0adb6397013616567249d2d82f94b27891 | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Thu May 10 17:20:56 2012 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Thu May 10 17:20:56 2012 +0900 |
| tree | 706010a586caf52edb8b647a6ca7b84a66eeb259 | |
| parent | c5e50fa90ce42b1689692f587d4881308881b73d [diff] | |
| parent | d42c97443da5a542201f6cbaf793606877115d05 [diff] | |
| parent | ef0fa5331a73e479a30f73e00937afb5109566d7 [diff] |
Merge branches 'sh/wdt' and 'sh/rsk-updates' into sh-latest Conflicts: arch/sh/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>