code sync, no visible changes yet
Merge pull request #11 from CyanogenMod-Atrix/master

pull form CyanogenMod-Atrix/kernel-olympus-3.1