summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-26 10:09:31 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-26 10:09:31 +0200
commit04871e934818988c1da318ec0a15f87065cd1ca2 (patch)
tree0a319b3220cac35a9790fd7e3e3217c089d3e320 /arch/arm/mach-imx
parentfcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff)
parent25c038ee0d3a6599f0165f97a651d988d7afd40b (diff)
parenta579cebd76d87fc5c81b8752783632e63c002dcc (diff)
parent4ab371539b41b1219b294f54cd12def62702cdbe (diff)
parentc61daf6b0a2f7048c6e74d52b043fa6a779b128a (diff)
Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd