Merge branch 'linus' into x86/urgent
[linux-2.6] / arch / powerpc / platforms / amigaone / Makefile
1 obj-y   += setup.o