Merge branch 'prcm-cleanup-3.1' of git://git.pwsan.com/linux-2.6 into cleanup-part-3
authorTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 06:18:06 +0000 (23:18 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 06:18:06 +0000 (23:18 -0700)

Trivial merge