Resolve patch conflicts after rebase to 2.6.22 mainline