Merge linux-3.0.y

Change-Id: If02dd217517813b9a8a53419630a88e829fdfda2