Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel