diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 10:05:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 10:05:39 -0700 |
| commit | b3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56 (patch) | |
| tree | 7239d8ee8302e3bb7ff74d9bc6195ab6bb52295c /drivers/pwm/pwm-samsung.c | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | staging: android: ion: fix wrong init of dma_buf_export_info (diff) | |
| download | linux-dev-b3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56.tar.xz linux-dev-b3f4ef0bf21da37e4dfc1cdfa0288ba39186fb56.zip | |
Merge tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf
Pull dma-buf updates from Sumit Semwal:
"Minor cleanup only; this could've gone in for the 4.0 merge window,
but for a copy-paste stupidity from me.
It has been in the for-next since then, and no issues reported.
- cleanup of dma_buf_export()
- correction of copy-paste stupidity while doing the cleanup"
* tag 'dma-buf-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sumits/dma-buf:
staging: android: ion: fix wrong init of dma_buf_export_info
dma-buf: cleanup dma_buf_export() to make it easily extensible
Diffstat (limited to 'drivers/pwm/pwm-samsung.c')
0 files changed, 0 insertions, 0 deletions