aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSimon Horman <horms+renesas@verge.net.au>2013-07-24 03:35:12 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-07-24 03:35:12 -0400
commit4431374926363df1d907d9c8783f473eb7facf42 (patch)
tree081b46bacebc68f7acf3a094bba1608bd2ab4fdc /arch
parentae3e4c277669e16093f0e71ca927cf33e7dde053 (diff)
parent0fb19cdabfc3f8884bac53fd81b02bf61c7904af (diff)
parent81b9d5351fa96caad4accc6711bc1b9342927d4a (diff)
Merge branches 'tpu-pwm', 'backlight' and 'soc' into cleanup2-base