Merge branch 'for_3.5/cleanup/omap-cpuidle' of git://git.kernel.org/pub/scm/linux...
authorTony Lindgren <tony@atomide.com>
Mon, 7 May 2012 20:51:31 +0000 (13:51 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 7 May 2012 20:51:31 +0000 (13:51 -0700)

Trivial merge