Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/