Merge branch 'features' of git://farnsworth.org/dale/linux-2.6-mv643xx_eth into upstream
[linux-2.6] / drivers / xen / Makefile
1 obj-y   += grant-table.o
2 obj-y   += xenbus/