Linux 3.0.96

Change-Id: Ie94c55ba2ec75a7ff346cfd39f76cd35c84fd5ff