diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 17:30:50 +0100 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 17:30:50 +0100 |
commit | cd15c51d6c2f577f896471a058f33a95f164dba2 (patch) | |
tree | 9d42b8ea581ca35bdf75467b8bbbab21e7056ff9 /fs/select.c | |
parent | Merge tag 'keystone/maintainer-file' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | Revert "ARM: OMAP2+: Remove legacy mux code for display.c" (diff) | |
download | linux-cd15c51d6c2f577f896471a058f33a95f164dba2.tar.xz linux-cd15c51d6c2f577f896471a058f33a95f164dba2.zip |
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
Diffstat (limited to 'fs/select.c')
0 files changed, 0 insertions, 0 deletions