Linux 3.4.96

Change-Id: Ie2b27cb936c5f99c418bb0c53a3f700172e512a0