| commit | bb3c9d4f851d51bb6302ef0df830dcec88d7c529 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Apr 08 10:47:05 2010 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Apr 08 10:47:05 2010 +0100 |
| tree | 446463d0b86dcf68b3a1538861422b1ce582de16 | |
| parent | d4d9959c099751158c5cf14813fe378e206339c6 [diff] | |
| parent | b3aa111f7ac1ad07009081a824b5ce7a71462c4c [diff] |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 Conflicts: arch/arm/mach-mx3/mach-pcm037.c