Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-btrfs-devel.git] / arch / avr32 / boards / merisc / Makefile

obj-y                                   += setup.o flash.o display.o merisc_sysfs.o