Merge branch 'linus' into perfcounters/core
[linux-2.6.git] / drivers / amba / Makefile
1 obj-y           += bus.o
2