Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent
authorPaul Mundt <lethal@linux-sh.org>
Wed, 10 Nov 2010 09:15:44 +0000 (18:15 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 10 Nov 2010 09:15:44 +0000 (18:15 +0900)
commit8ac5ba61cb1a80df407f2cdedb28b28d3b1d84ec
tree01a8efbcd56a78fb6eca42c415933eaa8f06bb67
parentbea278278f0bb9af3ce6234acece9772d401a252
parent899be96db75451ba98cb217109ef4cf2ee6de927
parented10b490ea6498f76284043565d42ca3649ccca1
Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent