Merge tag 'disintegrate-main-20121013' of git://git.infradead.org/users/dhowells...