Merge branch 'for-rmk' of git://git.android.com/kernel into devel