Merge branch 'master' of /home/trondmy/kernel/linux-2.6/