diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-19 13:08:33 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-19 13:08:33 +0900 |
commit | 22fd67c5c94a188ded2bb7c78369fd751d1bb187 (patch) | |
tree | 95b5b2b7c7360d1d9e36a6dcaa7cc9baa1883540 /arch/sh/kernel/setup.c | |
parent | b8c193f88ebd8705b3e916532539031cd9fc0b4c (diff) | |
parent | 28fde6863e6ed1f4bfb7cef080e67bf439c20628 (diff) | |
parent | bc9f3d4291f8275924a9197a81208a5df0a15095 (diff) | |
download | linux-22fd67c5c94a188ded2bb7c78369fd751d1bb187.tar.gz linux-22fd67c5c94a188ded2bb7c78369fd751d1bb187.tar.bz2 linux-22fd67c5c94a188ded2bb7c78369fd751d1bb187.zip |
Merge branches 'sh/earlytimer' and 'sh/shmobile-r2r-staging'