526b2641 Fri Oct 07 14:57:31 CDT 2011 Arnd Bergmann <arnd@arndb.de> 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.