Merge tag 'disintegrate-sound-20121009' of git://git.infradead.org/users/dhowells...