| commit | 43a60c1792b13eed49220af0e1344bf48e3a0677 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 04 23:01:28 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 04 23:01:28 2012 +0100 |
| tree | cdacc16876e95df8a4ee7a554d267407ec0cb808 | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee [diff] | |
| parent | 9fc31ddc70ac594b5a1d8a83303b65008221088c [diff] |
Merge branch 'cleanup' into for-linus Conflicts: arch/arm/mach-imx/mach-imx27_visstrim_m10.c