summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-27 08:37:30 +0100
committerPaul Mundt <lethal@linux-sh.org>2012-01-27 08:37:30 +0100
commitc40e0fa51cc746cd2da58ca0b98c2f61280c7b4d (patch)
tree097dabe9365e1010c0658449fcc23558e8598da4 /arch/sh/kernel
parentMerge branch 'sh/clkfwk' into sh-latest (diff)
parentsh: se7724: fix compile breakage (diff)
parentsh: add platform_device for SPI1 in setup-sh7757 (diff)
downloadlinux-c40e0fa51cc746cd2da58ca0b98c2f61280c7b4d.tar.xz
linux-c40e0fa51cc746cd2da58ca0b98c2f61280c7b4d.zip
Merge branches 'sh/urgent' and 'sh/platform-updates' into sh-latest