]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6950d76 a125a39)
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)
* '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

1  2 
drivers/base/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/base/Makefile
Simple merge
Linux kernel for KaRo TX COM modules