Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx:
powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadia

+1
+1
arch/powerpc/boot/Makefile
··· 41 41 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405 42 42 $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405 43 43 $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405 44 + $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405 44 45 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405 45 46 $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405 46 47