Linux 3.4.46

combind commits from gregkh

Change-Id: If1b477429a20eabe03d45e904a5fb4d2ef82e692