Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Fri, 31 Oct 2008 07:18:02 +0000 (16:18 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Fri, 31 Oct 2008 07:18:02 +0000 (16:18 +0900)

Trivial merge