Merge branch 'for_3.5/cleanup/omap-cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into cleanup-cpuidle

This commit is contained in:
Tony Lindgren 2012-05-07 13:51:31 -07:00
commit 274994c49c
4 changed files with 190 additions and 293 deletions