| commit | 9a2ee7152ca1ccd70c9f68ae1ca8244d2272f743 | [log] [tgz] |
|---|---|---|
| author | Sascha Hauer <s.hauer@pengutronix.de> | Tue Nov 22 11:32:39 2011 +0100 |
| committer | Sascha Hauer <s.hauer@pengutronix.de> | Tue Nov 22 11:32:39 2011 +0100 |
| tree | 1ebcd9c9812a0b2857ef9bae39a399c3283dcdb1 | |
| parent | 13420c6b5bac9b05cf9a0ba9c46b8e1d18d45730 [diff] | |
| parent | ca06679d758933b726c2677b523a26bc581eadcf [diff] |
Merge branch 'cleanups/assorted' into imx-fixes-for-arnd Conflicts: arch/arm/mach-imx/mm-imx3.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>