| commit | b4cbb8a4e602ea77b0525d06eff89c6a6070dab3 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Oct 20 15:14:25 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Oct 20 15:14:25 2011 +0200 |
| tree | a5dd723679582505ef3905c90f0c2c032d191b94 | |
| parent | 526b264163068f77c5f2409031f5e25caf3900a9 [diff] | |
| parent | c5d7a9230e5e277f262b6806b7f4d6b35de5a3fb [diff] |
Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel Conflicts: arch/arm/mach-mx5/clock-mx51-mx53.c arch/arm/mach-mx5/devices-imx53.h