Merge branch 'prcm-fixes-3.1' of git://git.pwsan.com/linux-2.6 into tmp-rebuild-13103...
authorTony Lindgren <tony@atomide.com>
Sun, 10 Jul 2011 20:07:20 +0000 (13:07 -0700)
committerTony Lindgren <tony@atomide.com>
Sun, 10 Jul 2011 20:07:20 +0000 (13:07 -0700)

Trivial merge