tree 8676cfdb7f8c1ac5ee124aef050d541d70f876d0
parent 6950d76c531671ec389e36183311826597951ac6
parent a125a3945c950caef001f22055bf201a36568533
author Linus Torvalds <torvalds@linux-foundation.org> 1326060309 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1326060309 -0800

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