Merge commit 'v2.6.30-rc1' into sched/urgent
[linux-2.6] / arch / avr32 / boards / merisc / Makefile
1 obj-y                                   += setup.o flash.o display.o merisc_sysfs.o