summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-09 08:51:46 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-11-09 08:51:46 +0100
commit5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (patch)
treecdab5ebea615534a03194f5d85f76c3468b0183d /arch/sh
parentsh: Break out cpuinfo_op procfs bits. (diff)
parentsh: machvec IO death. (diff)
parentsh: intc: Fix up initializers for gcc 4.5. (diff)
downloadlinux-5c4986b8a9ddd9cf649abe38a102866f7809b1d2.tar.xz
linux-5c4986b8a9ddd9cf649abe38a102866f7809b1d2.zip
Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest