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