diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 10:59:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-28 10:59:53 +0100 |
| commit | 8a28d67457b613258aa0578ccece206d166f2b9f (patch) | |
| tree | 54113ea738e9e5fa7aeb133210cdae037eb92783 /fs/file.c | |
| parent | block: re-add discard_granularity and alignment checks (diff) | |
| parent | powerpc/dma: dma_set_coherent_mask() should not be GPL only (diff) | |
| download | linux-8a28d67457b613258aa0578ccece206d166f2b9f.tar.xz linux-8a28d67457b613258aa0578ccece206d166f2b9f.zip | |
Merge tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fix from Michael Ellerman:
- powerpc/dma: dma_set_coherent_mask() should not be GPL only from Ben
* tag 'powerpc-4.3-6' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/dma: dma_set_coherent_mask() should not be GPL only
Diffstat (limited to 'fs/file.c')
0 files changed, 0 insertions, 0 deletions