diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-08 01:59:28 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-08 01:59:28 +0400 |
| commit | 6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40 (patch) | |
| tree | 4277ede78d08047ab1ab92cda179da7e40a357a7 /arch/arm/mach-highbank/smc.S | |
| parent | 434978e678605c8370d3d71e88796c264f70a8bf (diff) | |
| parent | 350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a (diff) | |
| download | linux-6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40.tar.xz | |
Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
* 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
ARM i.MX imx21ads: Fix overlapping static i/o mappings
ARM i.MX27 Visstrim M10: fix gpio handling.
ARM: imx: only call l2x0_init if it's available
ARM: imx: only specify i2c device type once
ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI
Diffstat (limited to 'arch/arm/mach-highbank/smc.S')
0 files changed, 0 insertions, 0 deletions