Merge branch 'dma-buf-merge' of git://people.freedesktop.org/~airlied/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jan 2012 22:05:09 +0000 (14:05 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jan 2012 22:05:09 +0000 (14:05 -0800)
commit8e369672af8700299ab372bad9397f230b1d591a
tree8676cfdb7f8c1ac5ee124aef050d541d70f876d0
parent6950d76c531671ec389e36183311826597951ac6
parenta125a3945c950caef001f22055bf201a36568533
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
drivers/base/Makefile