Merge branch 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux

* 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux:
  dma-buf: mark EXPERIMENTAL for 1st release.
  dma-buf: Documentation for buffer sharing framework
  dma-buf: Introduce dma buffer sharing mechanism

diff --combined drivers/base/Makefile
index 1334d893b560c655bf6840238c94339e64f2f46b,d0df046a70d8a1d0601b8b33e7aa4ddf5a8f90ef..2c8272dd93c4690229e3ea2442488e99a6de22e9
--- 1/drivers/base/Makefile
--- 2/drivers/base/Makefile
+++ b/drivers/base/Makefile
@@@ -3,16 -3,17 +3,17 @@@
  obj-y                 := core.o sys.o bus.o dd.o syscore.o \
                           driver.o class.o platform.o \
                           cpu.o firmware.o init.o map.o devres.o \
 -                         attribute_container.o transport_class.o
 +                         attribute_container.o transport_class.o \
 +                         topology.o
  obj-$(CONFIG_DEVTMPFS)        += devtmpfs.o
  obj-y                 += power/
  obj-$(CONFIG_HAS_DMA) += dma-mapping.o
  obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
+ obj-$(CONFIG_DMA_SHARED_BUFFER) += dma-buf.o
  obj-$(CONFIG_ISA)     += isa.o
  obj-$(CONFIG_FW_LOADER)       += firmware_class.o
  obj-$(CONFIG_NUMA)    += node.o
  obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
 -obj-$(CONFIG_SMP)     += topology.o
  ifeq ($(CONFIG_SYSFS),y)
  obj-$(CONFIG_MODULES) += module.o
  endif