diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 17:06:28 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-18 17:06:28 +0200 |
| commit | 09784fb8ef79f5c5adb9c1b4d0df000354e476e7 (patch) | |
| tree | 329f69c311fa1d1da20052ce0920bb680d1ef5ae /drivers/mfd/jz4740-adc.c | |
| parent | Merge tag 'powerpc-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/po... (diff) | |
| parent | x86/pci/dma: Fix gfp flags for coherent DMA memory allocation (diff) | |
| download | linux-09784fb8ef79f5c5adb9c1b4d0df000354e476e7.tar.xz linux-09784fb8ef79f5c5adb9c1b4d0df000354e476e7.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Thomas Gleixner:
"A single regression fix for the x86 dma allocator which got wreckaged
in the merge window"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/pci/dma: Fix gfp flags for coherent DMA memory allocation
Diffstat (limited to 'drivers/mfd/jz4740-adc.c')
0 files changed, 0 insertions, 0 deletions