Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[linux-2.6] / drivers / xen / Makefile
1 obj-y   += grant-table.o
2 obj-y   += xenbus/