summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-19 13:08:33 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-19 13:08:33 +0900
commit22fd67c5c94a188ded2bb7c78369fd751d1bb187 (patch)
tree95b5b2b7c7360d1d9e36a6dcaa7cc9baa1883540
parentb8c193f88ebd8705b3e916532539031cd9fc0b4c (diff)
parent28fde6863e6ed1f4bfb7cef080e67bf439c20628 (diff)
parentbc9f3d4291f8275924a9197a81208a5df0a15095 (diff)
Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'