diff options
| author | Sumit Semwal <sumit.semwal@ti.com> | 2012-04-24 15:07:19 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@ti.com> | 2012-04-24 15:07:19 +0530 |
| commit | 3c0c17f298ff4bd92ebdbe3ef28fcd6d22bad165 (patch) | |
| tree | 5aec26b6dc539b837308bd890b9d509a0e43d68d /drivers/mca/mca-legacy.c | |
| parent | 3f18bd706cfec657ce6fbb717bcad735a6211412 (diff) | |
| parent | c39b3b95c45af2f73fba179d7ee17edda97dbc38 (diff) | |
| download | panda-3c0c17f298ff4bd92ebdbe3ef28fcd6d22bad165.tar.gz | |
Merge branch 'drm-dmabuf2' of git://people.freedesktop.org/~airlied/linux into umm-3.4rc4-wip
Resolved Conflicts in:
drivers/base/dma-buf.c
include/linux/dma-buf.h
Also corrected EXPORT_SYMBOL to EXPORT_SYMBOL_GPL and !DMABUF case
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
Diffstat (limited to 'drivers/mca/mca-legacy.c')
0 files changed, 0 insertions, 0 deletions