Linux 3.4.92 - squashed commit

Change-Id: Ib2b2093c56330e24b089e4401dbb4d6f3b0c8081