Merge branch 'linus' into x86/mm
[linux-2.6] / drivers / dma / ipu / Makefile
1 obj-y   += ipu_irq.o ipu_idmac.o