Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into fbdev...

Various fbdev changes for 3.11

* xilinxfb updates
* Small cleanups and fixes to multiple drivers

diff --cc drivers/video/Kconfig
Simple merge

diff --cc drivers/video/fbmem.c
Simple merge

diff --cc drivers/video/mmp/hw/mmp_ctrl.c
Simple merge

diff --cc drivers/video/omap2/displays/panel-taal.c
Simple merge

diff --cc drivers/video/omap2/dss/dpi.c
Simple merge