From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 22 Sep 2011 21:39:23 +0000 (+0100)
Subject: Merge branch 'pm' into devel-stable
X-Git-Tag: v3.2-rc1~130^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b0a37dca72a05b7b579f288d8a67afeed96bffa5;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'pm' into devel-stable
---

b0a37dca72a05b7b579f288d8a67afeed96bffa5