Merge tag 'disintegrate-alpha-20121217' of git://git.infradead.org/users/dhowells...