Merge branch 'for-2.6.31' of git://linux-nfs.org/~bfields/linux
[linux-2.6] / drivers / amba / Makefile
1 obj-y           += bus.o
2