Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[linux-2.6] / arch / powerpc / platforms / maple / Makefile
1 obj-y   += setup.o pci.o time.o