Pull from CyanogenMod-Atrix/kernel-olympus-3.1