Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Mon, 31 May 2010 03:59:19 +0000 (12:59 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 31 May 2010 03:59:19 +0000 (12:59 +0900)

Trivial merge