Merge branch 'master' into sh/clkfwk
authorPaul Mundt <lethal@linux-sh.org>
Tue, 12 May 2009 10:54:36 +0000 (19:54 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 12 May 2009 10:54:36 +0000 (19:54 +0900)

Trivial merge