From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 7 Oct 2011 19:57:31 +0000 (+0200)
Subject: Merge branch 'imx/cleanup' into imx/devel
X-Git-Tag: v3.2-rc1~39^2~3^3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=526b264163068f77c5f2409031f5e25caf3900a9;p=pandora-kernel.git

Merge branch 'imx/cleanup' into imx/devel

This helps resolve the conflicts between the imx cleanups and the
new code that has gone into the imx tree.
Conflict resolution was originally done by Sascha Hauer.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

526b264163068f77c5f2409031f5e25caf3900a9
Reading git-diff-tree failed