| commit | 526b264163068f77c5f2409031f5e25caf3900a9 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Fri Oct 07 21:57:31 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Fri Oct 07 21:57:31 2011 +0200 |
| tree | 196e7581f1546e48ba392ff099f369e5c622636b | |
| parent | 4c4cbce68f57555cddb9d77da333bf50875148ce [diff] | |
| parent | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 [diff] |
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>