summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pciLinus Torvalds2012-07-2498-1109/+1846
|\
| * Merge branch 'pci/yinghai-pciehp-unused' into nextBjorn Helgaas2012-07-182-105/+0
| |\
| | * PCI: pciehp: remove unused pciehp_get_max_lnk_width(), pciehp_get_cur_lnk_wid...Yinghai Lu2012-07-122-105/+0
| * | Merge branch 'pci/nikhil-big-bar-fixes' into nextBjorn Helgaas2012-07-181-53/+54
| |\ \
| | * | PCI: reorder __pci_assign_resource() (no change)Bjorn Helgaas2012-07-111-52/+52
| | * | PCI: fix truncation of resource size to 32 bitsNikhil P Rao2012-07-111-1/+2
| | |/
| * | Merge branch 'pci/julia-return-values' into nextBjorn Helgaas2012-07-164-16/+40
| |\ \
| | * | PCI: hotplug: ensure a consistent return value in error caseJulia Lawall2012-07-164-16/+40
| | |/
| * | Merge branch 'pci/myron-final-fixups-v2' into nextBjorn Helgaas2012-07-162-19/+5
| |\ \
| | * | PCI: fix undefined reference to 'pci_fixup_final_inited'Myron Stowe2012-07-162-19/+5
| * | | Merge branch 'pci/greg-m68k' into nextBjorn Helgaas2012-07-131-0/+1
| |\ \ \
| | * | | PCI: build resource code for M68K architectureGreg Ungerer2012-07-131-0/+1
| | | |/ | | |/|
| * | | Merge branch 'pci/yinghai-hotplug-cleanup' into nextBjorn Helgaas2012-07-113-11/+3
| |\ \ \
| | * | | PCI: acpiphp: merge acpiphp_debug and debugYinghai Lu2012-07-102-6/+3
| | * | | PCI: acpiphp: remove unused res_lockYinghai Lu2012-07-102-5/+0
| | |/ /
| * | | Merge branch 'pci/bjorn-p2p-bridge-windows' into nextBjorn Helgaas2012-07-106-149/+53
| |\ \ \
| | * | | sparc/PCI: replace pci_cfg_fake_ranges() with pci_read_bridge_bases()Bjorn Helgaas2012-07-101-88/+1
| | * | | PCI: support sizing P2P bridge I/O windows with 1K granularityYinghai Lu2012-07-091-6/+22
| | * | | PCI: reimplement P2P bridge 1K I/O windows (Intel P64H2)Bjorn Helgaas2012-07-095-52/+27
| | * | | PCI: allow P2P bridge windows starting at PCI bus address zeroBjorn Helgaas2012-07-091-3/+3
| | |/ /
| * | | Merge branch 'pci/bjorn-disable-decode' into nextBjorn Helgaas2012-07-092-3/+21
| |\ \ \
| | * | | PCI: disable MEM decoding while updating 64-bit MEM BARsBjorn Helgaas2012-07-091-0/+18
| | * | | PCI: leave MEM and IO decoding disabled during 64-bit BAR sizing, tooBjorn Helgaas2012-07-091-3/+3
| | |/ /
| * | | Merge branch 'pci/myron-final-fixups-v2' into nextBjorn Helgaas2012-07-095-36/+75
| |\ \ \ | | | |/ | | |/|
| | * | PCI: call final fixups hot-added devicesMyron Stowe2012-07-092-0/+22
| | * | PCI: move final fixups from __init to __devinitMyron Stowe2012-07-091-4/+4
| | * | x86/PCI: move final fixups from __init to __devinitMyron Stowe2012-07-091-1/+1
| | * | MIPS/PCI: move final fixups from __init to __devinitMyron Stowe2012-07-093-4/+4
| | * | PCI: never discard enable/suspend/resume_early/resume fixupsMyron Stowe2012-07-091-14/+14
| | * | PCI: release temporary reference in __nv_msi_ht_cap_quirk()Myron Stowe2012-07-091-2/+5
| | * | PCI: restructure 'pci_do_fixups()'Myron Stowe2012-07-091-16/+30
| | |/
| * | Merge branch 'pci/rafael-pci_set_power_state-rebase' into nextBjorn Helgaas2012-07-053-7/+27
| |\ \
| | * | PCI / PM: restore the original behavior of pci_set_power_state()Rafael J. Wysocki2012-07-053-7/+27
| * | | Merge branch 'pci/myron-pcibios_setup' into nextBjorn Helgaas2012-07-0520-96/+21
| |\ \ \
| | * | | xtensa/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-6/+0
| | * | | x86/PCI: adjust section annotations for pcibios_setup()Myron Stowe2012-07-051-1/+1
| | * | | unicore32/PCI: adjust section annotations for pcibios_setup()Myron Stowe2012-07-051-1/+1
| | * | | tile/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-10/+0
| | * | | sparc/PCI: factor out pcibios_setup()Myron Stowe2012-07-053-21/+0
| | * | | sh/PCI: adjust section annotations for pcibios_setup()Myron Stowe2012-07-051-2/+2
| | * | | sh/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-5/+0
| | * | | powerpc/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-5/+0
| | * | | parisc/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-5/+0
| | * | | MIPS/PCI: adjust section annotations for pcibios_setup()Myron Stowe2012-07-052-4/+4
| | * | | MIPS/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-11/+0
| | * | | microblaze/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-5/+0
| | * | | ia64/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-9/+0
| | * | | cris/PCI: factor out pcibios_setup()Myron Stowe2012-07-051-5/+0
| | * | | alpha/PCI: factor out pcibios_setup()Myron Stowe2012-06-261-6/+0
| | * | | PCI: pull pcibios_setup() up into coreMyron Stowe2012-06-262-0/+13
| | | |/ | | |/|