summaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-06-13 17:04:54 -0600
committerBjorn Helgaas <bhelgaas@google.com>2012-06-13 17:04:54 -0600
commitcc2fa3fa320d5f40a12713c104bbe5d3da4636e4 (patch)
tree342445a784c566116505ab8c9e7a24803a6e70c4 /mm/memory.c
parent10c480933d0ad2ea27630cbaa723a5d33dbece00 (diff)
parenta0dee2ed0cdc666b5622f1fc74979355a6b36850 (diff)
downloadblackbird-op-linux-cc2fa3fa320d5f40a12713c104bbe5d3da4636e4.tar.gz
blackbird-op-linux-cc2fa3fa320d5f40a12713c104bbe5d3da4636e4.zip
Merge branch 'topic/alex-vfio-prep' into next
* topic/alex-vfio-prep: PCI: misc pci_reg additions PCI: create common pcibios_err_to_errno PCI: export pci_user functions for use by other drivers PCI: add ACS validation utility PCI: add PCI DMA source ID quirk
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud