From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 Jun 2012 07:08:58 +0000 (-0700)
Subject: Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.6-rc1~148^2~4^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4348be7a589d587cf0a314bdd1d848e1b9cf9c0b;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'for_3.6/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes-non-critical
---

4348be7a589d587cf0a314bdd1d848e1b9cf9c0b