summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-07-17 21:27:28 +0200
committerArnd Bergmann <arnd@arndb.de>2011-07-17 21:27:28 +0200
commitbcacff291c96c163da9341b764f0ccdeb97b38ad (patch)
tree04001a760f8567c015ce6dd56ab8aea6fd7dbceb /arch/arm/mach-orion5x
parentc8bbde430f837c7ae280b6ac8d4a27b056b83318 (diff)
parent62778396020a29d742abf980c1e83f3df4b5426e (diff)
parent6662498e132dfa758925a160fd5ef80a083651c3 (diff)
Merge branches 'at91/fixes', 'imx/fixes' and 'pxa/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/fixes