Merge branch 'prcm-fixes-3.1' of git://git.pwsan.com/linux-2.6 into fixes-part-2
authorTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 09:08:37 +0000 (02:08 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 09:08:37 +0000 (02:08 -0700)

Trivial merge