From: Tony Lindgren <tony@atomide.com>
Date: Mon, 10 Jun 2013 03:46:58 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.11/pm' into omap-for-v3.11/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=569ecbe7dc084886b7bae47a59203fbd08125971;p=pandora-kernel.git

Merge branch 'omap-for-v3.11/pm' into omap-for-v3.11/tmp-merge
---

569ecbe7dc084886b7bae47a59203fbd08125971
Reading git-diff-tree failed