aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-spear13xx/spear13xx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-22 14:31:41 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-07-22 14:31:41 -0400
commit8cfc545e0e3e6cc82acfdc79321b41eeeab0ca45 (patch)
tree23fbe86fe5edc59a3beb1adebc410e411181725c /arch/arm/mach-spear13xx/spear13xx.c
parent1beaf762b4ad5f53876f790bb6cfbd3bac072985 (diff)
parent86f5fcfc3e400b2ac1562cb0fd6aabc9f83ee3e2 (diff)
parent15719ccc274981b19ad8fe9ac20c94249de8a257 (diff)
Merge branches 'regulator-core', 'regulator-dt' and 'regulator-dummy' into regulator-next