Fix Linux update merge errors

Signed-off-by: ptmr3 <ptmr323@gmail.com>
Linux 3.4.51 - 3.4.60

Signed-off-by: ptmr3 <ptmr323@gmail.com>