From: Tony Lindgren <tony@atomide.com>
Date: Sat, 11 Aug 2012 06:21:57 +0000 (-0700)
Subject: Merge branch 'for_3.6/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~2149^2~6^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cf835e8d226481984f72dffc6034fe75e296511e;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for_3.6/fixes/pm' of git://git./linux/kernel/git/khilman/linux-omap-pm into fixes
---

cf835e8d226481984f72dffc6034fe75e296511e