fix merge derp

Change-Id: I931db1e569cc696464757c872bcffa6f0b1d987e

enable ksm on hammerhead defconfig

Change-Id: Ib91b4392b87a3823e4fbcfe9975d7f3c6799205e

add -maddoggin

Change-Id: I8084e1db37836a24e82781a0564e70dad7161e2c
Merge branch 'kitkat-mr2' of github.com:maddoggin/kernel_lge_hammerhead into kitkat-mr2