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-mx5 | |
| parent | e93aabb5522be0a42b95be4ca91ef8f530c26975 (diff) | |
| parent | 6132ae8154f923b9064e2d8900b10eed498f2c42 (diff) | |
| parent | 318007e9001349db9b4fcd49e9e79a7636dba7a9 (diff) | |
| parent | 05822c83d2839b28c541eebc9f8be6da3a0b6a83 (diff) | |
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>