mcde: fix rebase issues in patch adding new MCDE display, AB8500 Denc and AV8100 driver

See comments:
http://gerrit.lud.stericsson.com/gerrit/2378

Reported-by: Marcel Tuennissen <marcel.tuennissen@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: Ib05e91e2840a66893dfed7d01bddaf4a0162e001
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2607
Reviewed-by: Marcel TUNNISSEN <marcel.tuennissen@stericsson.com>
2 files changed