Merge linux-stable 3.0.28 into android-3.0