summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-08-26 10:10:12 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2011-08-26 10:10:12 +0200
commite93aabb5522be0a42b95be4ca91ef8f530c26975 (patch)
tree98a17a27766e86ffb8976aed625e96e1e945d9da /arch
parentARM: mach-imx/mx25_3ds: Add FlexCAN support (diff)
parentARM: mx5: use generic function for displaying silicon revision (diff)
parentARM: imx: Define functions for registering PATA (diff)
parentARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCs (diff)
parentarm: mach-mxs: add rtc to all boards (diff)
downloadlinux-e93aabb5522be0a42b95be4ca91ef8f530c26975.tar.xz
linux-e93aabb5522be0a42b95be4ca91ef8f530c26975.zip
Merge branches 'features/assorted', 'features/imx-cpurev', 'features/imx-pata', 'features/multisoc' and 'features/mxs' into imx-features-for-arnd