Merge with /home/tmlind/src/kernel/linux-2.6