Merge tag 'disintegrate-x86-20121214' of git://git.infradead.org/users/dhowells/linux...