Defconfig: enabled KSM
rtc alarm: fix bad index when canceling alarms[]

(backport from common android-3.0
commit: 692e468137ebb2a31431c4b3fad1dca0a2da7659)

It was using ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK as an
index.

Change-Id: I919860cc71254453e382616bce9fd5455802cb3d
Signed-off-by: JP Abgrall <jpa@google.com>
ARM: etm: Power down etm(s) when tracing is not enabled

Without this change a saw an 18% increase in idle power consumption
on one deivce when trace support is compiled into the kernel. Now
I see the same increase only when tracing.

Change-Id: I21bb5ecf1b7d29ce3790ceeb5323409cc22d5a3b
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Defconfig: enabled deadline scheduler and set it as default
Added smartassV2 governor
Fixed git merging errors
cpufreq: smartassv2: remove printk that spams the kernel log when WiFi is on
Defconfig: enabled smartassV2 governor
Defconfig: disabled unused Samsung features