[PATCH] powerpc: Merge bitops.h