Squashed update of kernel from 3.4.95 to 3.4.96
Squashed update of kernel from 3.4.96 to 3.4.97
Revert "Fix"

This reverts commit 830600297ab9ec3f9ff6384737925c8558fe45b7.
Fix

Signed-off-by: Javelin <javelinanddart@gmail.com>