git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5e50fa d42c974 ef0fa53)
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)
Conflicts:
arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

Trivial merge
Pandora Kernel Repository