[PATCH] powerpc: merge align.c