dmtimer: fix clock set when matching parent

Change-Id: Ib4d4020010f57d626b4c234728a9314feb2b6920
Revert "dmtimer: fix clock set when matching parent"

This reverts commit b67d0cbdb230382d536e820d7fe6e62c6c0adec2.

Change-Id: Ib3af12440237a09563559f30c9bd23233f910745
Revert "defconfig: update for backlight changes"

This reverts commit c3e948c3c773b0704f96943736822067f60a2f10.

Change-Id: Iabf4b75635a7a259d20fd33cecd3323a17df3c61
Revert "leds: remove omap-pwm driver"

This reverts commit b8dfd97c54914b1b95d182c744a9bc6bef44c001.

Change-Id: I0b68ffc369b212ff166ee93f4a8a210cd102663d
Revert "panel-backlight: change from omap-pwm led driver to o2micro backlight driver"

This reverts commit addde5b255a48b5904b48cac53c27dd0409bcc29.

Change-Id: Ib9ac8c025cde1e1ba20b8d2c6fc24aa6db7d678c
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD