]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel...
authorKevin Hilman <khilman@linaro.org>
Fri, 20 Dec 2013 16:30:50 +0000 (08:30 -0800)
committerKevin Hilman <khilman@linaro.org>
Fri, 20 Dec 2013 16:30:50 +0000 (08:30 -0800)
commitcd15c51d6c2f577f896471a058f33a95f164dba2
tree9d42b8ea581ca35bdf75467b8bbbab21e7056ff9
parent5b8314a98888b12159d0b1b14982b8dd2d94e3f5
parent130f769e81fc472beb2211320777e26050e3fa15
Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/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
MAINTAINERS