Merge branch 'master' into for-next
[linux-2.6] / drivers / amba / Makefile
1 obj-y           += bus.o
2