Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86