Linux 3.4.46

combind commits from gregkh

Change-Id: I3bf211a9ac2bedbd5574934bfb5b817690d47e8c