From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 5 Aug 2009 21:10:52 +0000 (+0100)
Subject: Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~12971^2~1^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=13efdbecc65ef6ec4028551fb223dea5c5e3143c;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pm-upstream/fixes' of git://git./linux/kernel/git/khilman/linux-omap-pm into devel-stable
---

13efdbecc65ef6ec4028551fb223dea5c5e3143c