Merge branch 'master' into upstream
[linux-2.6] / arch / powerpc / platforms / pasemi / Makefile
1 obj-y   += setup.o pci.o time.o