Merge branch 'android-3.0' of https://android.googlesource.com/kernel/common into jb_mr1.1_exp