Merge tags 'omap-cleanup-for-v3.6', 'omap-devel-dmtimer-for-v3.6' and 'omap-devel...
authorTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:29:31 +0000 (00:29 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 4 Jul 2012 07:29:31 +0000 (00:29 -0700)

Trivial merge