Merge changes from linux-2.6 by hand