Merge branch 'master' of git://android.git.kernel.org/platform/development into eclair