Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[linux-2.6] / arch / avr32 / boards / merisc / Makefile
1 obj-y                                   += setup.o flash.o display.o merisc_sysfs.o