Update linux-atm fixes to reflect the final upstream pull request