Revert "Merge omapzoom-changes into drivers/video/omap2/dss/dispc.c"

This seems to be the real cause for the rare SODs, revert it for now.

This reverts commit 0313c87cd8ea16810d7a9239045160e093bbce70.

Conflicts:
	drivers/video/omap2/dss/dispc.c

Change-Id: I6a889b39a73afb742ae05a06deb37db30d6454e9
Revert "Revert "omap4-common: fix wake on unplug""

This commit did not cause SODs, let's get it back.

This reverts commit c41b94fe5d135e9ef49dc4e69aca751d4b0e2367.

Change-Id: I73aced42568d0bc830345c28198e06de41767114
Merge branch 'cm-11.0' into kk_mkt