]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'sh/driver-core' into sh/clkfwk
authorPaul Mundt <lethal@linux-sh.org>
Mon, 29 Mar 2010 07:00:06 +0000 (16:00 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 29 Mar 2010 07:00:06 +0000 (16:00 +0900)

Trivial merge