Linux 3.4.46

combind commits from gregkh

Change-Id: Idd8040c76d0266588977adf9385f57b1daf05498