Merge tag 'disintegrate-powerpc-20121009' into merge

UAPI Disintegration 2012-10-09