diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-07-05 00:33:40 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-05 00:33:40 +0900 |
commit | 1ecc6ab669e7e82603c60e692566d2d592cb8fb4 (patch) | |
tree | 165a370c24275ef6d6fa088f32cd97544fe224a7 | |
parent | 4048e5ca29afbd747a16245f2bc4d1d521a6d0d0 (diff) | |
parent | 7426394f20c2e74b7c560bcd266cec1b327a269b (diff) | |
parent | 9731f4a202f29ff402ea2ddad7ff6f3a559c0c82 (diff) |
Merge branches 'sh/hwblk', 'sh/cpuidle' and 'sh/stable-updates'