Merge pull request #15 from mifl/msm-3.0

Linux v3.0.21