summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-30 23:26:28 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-30 23:26:28 +0100
commit36bc45e219f48b5ec45c5aa34bc13dbe80e10c10 (patch)
treefa1ed8f19232dd08521146efaad44f254b4703f4 /arch/arm/mach-imx
parent976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff)
parent70e5f5efcc933af55a3a18efdb3b2edd3eb510ec (diff)
parent91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff)
parentf55be1bf52aad524dc1bf556ae26c90262c87825 (diff)
Merge branches 'depends/rmk/io', 'depends/rmk/l2x0' and 'depends/rmk/gpio' into highbank/soc