summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/include/mach
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-14 17:43:35 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-14 17:43:59 +0200
commitfcd8d84a585f3578a9ebdd27e757495a27415322 (patch)
tree58f37676ad56d322e47d0fa7343afb85445f7649 /arch/arm/mach-mxs/include/mach
parenteae0185a9677d3ff0c1781ee196f2ef42deb0ea1 (diff)
parent66a2886d867343eff6bf2646bea2c923d0cbf620 (diff)
parent4f5a9fd341e8ffd825ecf56155df6fe6c3d732b1 (diff)
Merge branches 'spear/clock' and 'imx/clock' into next/clock
Updated to resolve dependencies. Signed-off-by: Arnd Bergmann <arnd@arndb.de>