| commit | e59a7943f2f72a1dc218447f4f285c8b67b3a98e | [log] [tgz] |
|---|---|---|
| author | Sascha Hauer <s.hauer@pengutronix.de> | Thu Jul 07 10:00:49 2011 +0200 |
| committer | Sascha Hauer <s.hauer@pengutronix.de> | Thu Jul 07 10:00:49 2011 +0200 |
| tree | 278b164568087fd6c92bb31572238ecf9ab4674f | |
| parent | fad107086d5a869c1c07e5bb35b7b57a10ecf578 [diff] | |
| parent | 2ce420da39078a6135d1c004a0e4436fdc1458b4 [diff] |
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>