omap4-common: release st_wake_lock after 5s

During normal operation the st_wake_lock is only held for a fraction of
a second. But sometimes on bootup the st_wake_lock is acquired and not
released until the device uses bluetooth or gps for the first time.
This leads to devices not entering deep sleep.

Releasing the lock after 5s is a work-around for this problem until the
real cause is found, but no negative effect has been observed as the
wake-lock is held for a much shorter time if the shared-transport is
actually used.

Change-Id: I9ecd7c2bd2b70b7e48207609886b237acf1a1da5
omap4-common: enable support for Kernel SamePage Merging

Change-Id: I6187e09674235519a320a27887f7a9f5507218de
Revert "[moto] arch/arm/mach-omap2/omap4-sar: changes for sar restore"

This reverts commit ff20cec2cdbd4192b2cb3b0bc5e1ea445a5cb14c.

The reverted commit is an attempted workaround from motorola to fix OMAP
errata i719 which caused suspend/resume-problems leading at least to
increased battery usage.

The upstream-workaround for this errata from omapzoom is already applied
to this tree, so revert motorola's attempt.

Change-Id: Id559b94d5a354b922e53e6269da60924edf19f35
Merge changes I6187e096,I9ecd7c2b into cm-11.0

* changes:
  omap4-common: enable support for Kernel SamePage Merging
  omap4-common: release st_wake_lock after 5s
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0