Add changes from the Linux-2.6 tree.