diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-10 18:15:44 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-10 18:15:44 +0900 |
| commit | 8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec (patch) | |
| tree | 01a8efbcd56a78fb6eca42c415933eaa8f06bb67 /drivers/char/nozomi.c | |
| parent | bea278278f0bb9af3ce6234acece9772d401a252 (diff) | |
| parent | 899be96db75451ba98cb217109ef4cf2ee6de927 (diff) | |
| parent | ed10b490ea6498f76284043565d42ca3649ccca1 (diff) | |
| download | linux-3.10-8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec.tar.gz linux-3.10-8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec.tar.bz2 linux-3.10-8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec.zip | |
Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent