diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 21:14:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 21:14:23 -0800 |
| commit | c5a37883f42be712a989e54d5d6c0159b0e56599 (patch) | |
| tree | e66d224e2e1b8ce0f9022fde55f8a3a5c939233d /net/bluetooth/smp.c | |
| parent | 5dfe5b2c714a5bea0908c1e00da0e8e00535f55c (diff) | |
| parent | 247e75dba60140395cd7e808d32f76f208bedf76 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge final patch-bomb from Andrew Morton:
"Various leftovers, mainly Christoph's pci_dma_supported() removals"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
pci: remove pci_dma_supported
usbnet: remove ifdefed out call to dma_supported
kaweth: remove ifdefed out call to dma_supported
sfc: don't call dma_supported
nouveau: don't call pci_dma_supported
netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
cx23885: use pci_set_dma_mask insted of pci_dma_supported
cx25821: use pci_set_dma_mask insted of pci_dma_supported
cx88: use pci_set_dma_mask insted of pci_dma_supported
saa7134: use pci_set_dma_mask insted of pci_dma_supported
saa7164: use pci_set_dma_mask insted of pci_dma_supported
tw68-core: use pci_set_dma_mask insted of pci_dma_supported
pcnet32: use pci_set_dma_mask insted of pci_dma_supported
lib/string.c: add ULL suffix to the constant definition
hugetlb: trivial comment fix
selftests/mlock2: add ULL suffix to 64-bit constants
selftests/mlock2: add missing #define _GNU_SOURCE
Diffstat (limited to 'net/bluetooth/smp.c')
0 files changed, 0 insertions, 0 deletions