Merge branch 'gingerbread' of git://android.git.kernel.org/platform/development into HEAD