Merge tag 'disintegrate-parisc-20121016' into for-linus