Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 04:52:34 +0000 (13:52 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 4 Aug 2010 04:52:34 +0000 (13:52 +0900)

Trivial merge