Merge branch 'fbdev/stable-updates'
authorPaul Mundt <lethal@linux-sh.org>
Wed, 13 Jul 2011 08:02:12 +0000 (17:02 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 13 Jul 2011 08:02:12 +0000 (17:02 +0900)

Trivial merge