Merge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 into...
authorTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:06:11 +0000 (16:06 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Sep 2011 23:06:11 +0000 (16:06 -0700)

Trivial merge