Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorPaul Mundt <lethal@linux-sh.org>
Tue, 7 Jul 2009 02:55:05 +0000 (11:55 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 7 Jul 2009 02:55:05 +0000 (11:55 +0900)

Trivial merge