code sync
Merge pull request #12 from CyanogenMod-Atrix/master

pull form CyanogenMod-Atrix/kernel-olympus-3.1