Merge branch 'x3'
authorPaul Mundt <lethal@linux-sh.org>
Wed, 20 Jun 2007 09:29:27 +0000 (18:29 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 20 Jun 2007 09:29:27 +0000 (18:29 +0900)

Trivial merge