tree dfde2fd974b8d15d1a1a5a2c13d57d5fe9dd8e76
parent 4d0226042c05588be47b06bc1dbe7a09c9c540a4
parent cf22854cee10e16e28b1dde136c37e82b7d503ee
author Tony Lindgren <tony@atomide.com> 1257981684 -0800
committer Tony Lindgren <tony@atomide.com> 1257981684 -0800

Merge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into 7xx-iosplit-plat-merge