Arnd Bergmann 526b264163 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>

2011-10-07 21:57:31 +02:00

8.8 KiB

Raw Blame History

View Raw