Merge branch 'fixes' of git://git.user.in-berlin.de/s5r6/linux1394