Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowel...