Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[linux-2.6] / arch / avr32 / boards / merisc / Makefile
1 obj-y                                   += setup.o flash.o display.o merisc_sysfs.o