Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Sun, 14 Jun 2009 12:22:15 +0000 (21:22 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Sun, 14 Jun 2009 12:22:15 +0000 (21:22 +0900)

Trivial merge