Upstream to Linux 3.4.29

It does build successfully with changes.