commit | 09784fb8ef79f5c5adb9c1b4d0df000354e476e7 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 18 08:06:28 2015 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 18 08:06:28 2015 -0700 |
tree | 329f69c311fa1d1da20052ce0920bb680d1ef5ae | |
parent | f240bdd2a5b7d523ecced64c855ee2c1499f2854 [diff] | |
parent | 590f07874e8e3c83729b919312c65aea2533c8cf [diff] |
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