summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci.c
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2015-04-15 22:24:49 +0200
committerDoug Ledford <dledford@redhat.com>2015-04-15 22:24:49 +0200
commitc1c2fef6cfb04cf30a56bb37cff40d3498d7edbf (patch)
tree2476709d0bd4c9c8de71a849d5d5396078be3c5a /arch/mips/pci/pci.c
parentIB/core: don't disallow registering region starting at 0x0 (diff)
parentIB/mlx4: Fix WQE LSO segment calculation (diff)
parentIB/iser: Rewrite bounce buffer code path (diff)
parentmlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit archi... (diff)
parentIB/mlx4: Change alias guids default to be host assigned (diff)
parentib_srpt: convert printk's to pr_* functions (diff)
downloadlinux-c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf.tar.xz
linux-c1c2fef6cfb04cf30a56bb37cff40d3498d7edbf.zip
Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1