From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 10 Aug 2009 14:50:27 +0000 (+0100)
Subject: Merge branch 'pm-upstream/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.31-rc7~36^2~5
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=96a4d1e23439e2356a105791bda95cc08d375b97;p=safe%2Fjmp%2Flinux-2.6

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

96a4d1e23439e2356a105791bda95cc08d375b97