From: Kevin Hilman <khilman@linaro.org>
Date: Fri, 20 Dec 2013 16:30:50 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.13-rc5~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd15c51d6c2f577f896471a058f33a95f164dba2;p=kernel%2Fkernel-generic.git

Merge tag 'omap-for-v3.13/display-fix' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

I accidentally removed some mux code for omap4 that I thought was
dead code as omap4 has been booting with device tree only since
v3.10. Turns out I also removed some display related mux code,
so let's revert that except for the dead code parts.

* tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (439 commits)
  Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
  +Linux 3.13-rc4
---

cd15c51d6c2f577f896471a058f33a95f164dba2