Bjorn Helgaas df58f46c0f Merge branch 'pci/jiang-bus-lock-v3' into next ... * pci/jiang-bus-lock-v3: PCI: Return early on allocation failures to unindent mainline code PCI: Simplify IOV implementation and fix reference count races PCI: Drop redundant setting of bus->is_added in virtfn_add_bus() unicore32/PCI: Remove redundant call of pci_bus_add_devices() m68k/PCI: Remove redundant call of pci_bus_add_devices() PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev() PCI: Fix refcount issue in pci_create_root_bus() error recovery path ia64/PCI: Clean up pci_scan_root_bus() usage PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus) PCI: Introduce pci_alloc_dev(struct pci_bus*) to replace alloc_pci_dev() PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count Conflicts: drivers/pci/probe.c		2013-06-14 17:47:46 -06:00
..
boot	sparc: Fix piggyback with newer binutils.	2012-12-03 11:24:25 -08:00
configs
crypto	sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.	2012-12-19 15:44:31 -08:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2013-05-04 18:34:13 -07:00
kernel	Merge branch 'pci/jiang-bus-lock-v3' into next	2013-06-14 17:47:46 -06:00
lib	Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS	2013-04-30 17:04:09 -07:00
math-emu
mm	mm/SPARC: use common help functions to free reserved pages	2013-05-07 18:38:26 -07:00
net	filter: bpf_jit_comp: refactor and unify BPF JIT image dump output	2013-03-21 17:25:56 -04:00
oprofile
power	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00
prom
Kbuild
Kconfig	Removal of GENERIC_GPIO for v3.10	2013-05-09 09:59:16 -07:00
Kconfig.debug
Makefile	sparc64: Hibernation support	2013-03-20 11:06:54 -07:00