Merge branch 'prcm-devel-3.1' of git://git.pwsan.com/linux-2.6 into tmp-rebuild-13105...
authorTony Lindgren <tony@atomide.com>
Wed, 13 Jul 2011 08:06:31 +0000 (01:06 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 13 Jul 2011 08:06:31 +0000 (01:06 -0700)

Trivial merge