Merge branch 'prcm-devel-3.1' of git://git.pwsan.com/linux-2.6 into tmp-rebuild-13103...
authorTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 13:29:41 +0000 (06:29 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 11 Jul 2011 13:29:41 +0000 (06:29 -0700)

Trivial merge