From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 Dec 2011 05:17:27 +0000 (-0800)
Subject: Merge branch 'next/pm' into for-next
X-Git-Tag: next-20111221~100^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae55cefbcc69fdd3d59f0a0bd6e186888222650c;p=karo-tx-linux.git

Merge branch 'next/pm' into for-next
---

ae55cefbcc69fdd3d59f0a0bd6e186888222650c