Fix up some mis-merges from Linux merge
Linux 3.4.36
Linux 3.4.37
Linux 3.4.38