aboutsummaryrefslogtreecommitdiffstats
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
parentLinux 3.1-rc3 (diff)
parentARM i.MX: remove ARCH_MX* macros from Makefile (diff)
parentarm/mxs: move MXS_GPIO_NR into mach/mxs.h (diff)
parentARM: i.MX53: clean up iomux-mx53.h (diff)
parentMerge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-cleanup (diff)
downloadlinux-dev-04871e934818988c1da318ec0a15f87065cd1ca2.tar.xz
linux-dev-04871e934818988c1da318ec0a15f87065cd1ca2.zip
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