Update cypress touchkey
ReActivate Zram for Android
Revert "s6e8aa0: Allow manual brightness to 300 candela"

This reverts commit aa07c8f0cd720c82760d957ccfa137cd29a2300a.
Revert "ARM: SMP: use a timing out completion for cpu hotplug"

This reverts commit c3ff9b1a12263d7769603951c7d5a7b4627cd581.
Revert "backport: smp: patches from mainline 3.5 to hopefully help with hotplug"

This reverts commit eb4a20004952d332ad9e873e9d9c80fd58c9e332.
Rename v3.9.6 R3