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)

Trivial merge