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