Linux 3.4.35
Fix up some mis-merges from Linux merge