Merge branch 'prcm-fixes-a-3.1rc' of git://git.pwsan.com/linux-2.6 into fixes
authorTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2011 10:38:31 +0000 (03:38 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Sep 2011 10:38:31 +0000 (03:38 -0700)

Trivial merge