diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 10:00:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 10:00:49 +0200 |
| commit | e59a7943f2f72a1dc218447f4f285c8b67b3a98e (patch) | |
| tree | 278b164568087fd6c92bb31572238ecf9ab4674f /arch/arm/configs/palmz72_defconfig | |
| parent | ARM i.MX debug macro: use CONFIG_SOC_* instead of CONFIG_ARCH_* (diff) | |
| parent | gpio/mxc: convert gpio-mxc to use basic_mmio_gpio library (diff) | |
| download | linux-e59a7943f2f72a1dc218447f4f285c8b67b3a98e.tar.xz linux-e59a7943f2f72a1dc218447f4f285c8b67b3a98e.zip | |
Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
Conflicts:
arch/arm/mach-imx/mach-mx31_3ds.c
arch/arm/mach-imx/mach-scb9328.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/configs/palmz72_defconfig')
0 files changed, 0 insertions, 0 deletions