Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
authorPaul Mundt <lethal@linux-sh.org>
Fri, 9 Nov 2007 08:59:53 +0000 (17:59 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 9 Nov 2007 08:59:53 +0000 (17:59 +0900)

Trivial merge