Merge branch 'fixes' of git://git.jdl.com/software/linux-3.0 into fixes