diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-29 10:40:29 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-29 10:40:29 +0200 |
| commit | ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3 (patch) | |
| tree | f76cebe89b2c03afe61046f5a954ac342e977069 /arch/arm/mach-imx/mach-mx25_3ds.c | |
| parent | Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata... (diff) | |
| parent | ARM: mx25: Add the missing IIM base definition (diff) | |
| parent | Fix pata imx resource (diff) | |
| parent | ARM i.MX entry-macro.S: remove now unused code (diff) | |
| download | linux-ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3.tar.xz linux-ca4e419c20bd4dfc8f4e6af5a4ec3928b21e76a3.zip | |
Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features
Conflicts:
arch/arm/plat-mxc/avic.c
arch/arm/plat-mxc/include/mach/common.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>