Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells...