summaryrefslogtreecommitdiff
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-27 16:37:30 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-01-27 16:37:30 +0900
commitc40e0fa51cc746cd2da58ca0b98c2f61280c7b4d (patch)
tree097dabe9365e1010c0658449fcc23558e8598da4 /arch/sh/kernel
parent75ed4da4810d8f8f95aefa62242926ed31862fe8 (diff)
parenta1ad803322a904a250fa901020b4a4dfaf51a829 (diff)
parenta206c0087323337595de1284feb09a98c2a389d2 (diff)
Merge branches 'sh/urgent' and 'sh/platform-updates' into sh-latest