diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2013-07-24 16:35:12 +0900 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-24 16:35:12 +0900 |
commit | 4431374926363df1d907d9c8783f473eb7facf42 (patch) | |
tree | 081b46bacebc68f7acf3a094bba1608bd2ab4fdc /arch/arm/mach-shmobile/include | |
parent | ae3e4c277669e16093f0e71ca927cf33e7dde053 (diff) | |
parent | 0fb19cdabfc3f8884bac53fd81b02bf61c7904af (diff) | |
parent | 81b9d5351fa96caad4accc6711bc1b9342927d4a (diff) | |
download | op-kernel-dev-4431374926363df1d907d9c8783f473eb7facf42.zip op-kernel-dev-4431374926363df1d907d9c8783f473eb7facf42.tar.gz |
Merge branches 'tpu-pwm', 'backlight' and 'soc' into cleanup2-base