summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-07 21:59:57 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-07 21:59:57 +0200
commit112d17d6f75b93e1dcaec2e2232a411148b3bf71 (patch)
tree65a691d3ef47d5a0ba2a01b3d14c04b2adfd7291 /arch/arm/mach-imx
parent684f741446f7a3108b4c167faf20214c42b7eeac (diff)
parent1fcaea7e4c932b2bcc2612fafec6e1917944d192 (diff)
parent526b264163068f77c5f2409031f5e25caf3900a9 (diff)
parentab3f5c1fc21e07896aca4f3a1552197565b72003 (diff)
Merge branches 'sirf/devel', 'at91/devel', 'imx/devel' and 'davinci/devel' into next/devel