summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pci/thierry-fixup-irqs' into nextBjorn Helgaas2012-09-1914-91/+7
|\
| * PCI: Provide a default pcibios_update_irq()Thierry Reding2012-09-1914-89/+5
| * PCI: Discard __init annotations for pci_fixup_irqs() and related functionsThierry Reding2012-09-1912-13/+13
* | Merge branch 'pci/konstantin-sysfs' into nextBjorn Helgaas2012-09-181-47/+10
|\ \
| * | PCI: Convert "new_id"/"remove_id" into generic pci_bus driver attributesKonstantin Khlebnikov2012-09-171-47/+10
| |/
* | Merge branch 'pci/jiang-get-domain-bus-slot' into nextBjorn Helgaas2012-09-175-35/+10
|\ \
| * | xen-pcifront: Use hotplug-safe pci_get_domain_bus_and_slot()Jiang Liu2012-09-121-8/+2
| * | PCI: Use hotplug-safe pci_get_domain_bus_and_slot()Jiang Liu2012-09-121-6/+2
| * | PCI/cpcihp: Use hotplug-safe pci_get_domain_bus_and_slot()Jiang Liu2012-09-121-6/+2
| * | PCI/vga: Use hotplug-safe pci_get_domain_bus_and_slot()Jiang Liu2012-09-121-12/+3
| * | ia64/PCI: Use hotplug-safe pci_get_domain_bus_and_slot()Jiang Liu2012-09-121-3/+1
* | | Merge branch 'pci/trivial' into nextBjorn Helgaas2012-09-136-32/+5
|\ \ \
| * | | PCI: Drop duplicate const in DECLARE_PCI_FIXUP_SECTIONMathias Krause2012-09-111-1/+1
| * | | PCI: Drop bogus default from ARCH_SUPPORTS_MSIJan Beulich2012-09-111-1/+0
| * | | PCI: cpqphp: Remove unreachable pathAlan Cox2012-09-111-20/+1
| * | | PCI: Remove bus number resource debug messagesBjorn Helgaas2012-08-241-5/+0
| * | | PCI/AER: Print completion message at KERN_INFO to match starting messageLance Ortiz2012-08-241-4/+2
| * | | PCI: Fix drivers/pci/pci.c kernel-doc warningsRandy Dunlap2012-08-221-1/+1
| |/ /
* | | Merge commit 'v3.6-rc5' into nextBjorn Helgaas2012-09-131181-8347/+12996
|\ \ \ | | |/ | |/|
| * | Linux 3.6-rc5v3.6-rc5Linus Torvalds2012-09-091-1/+1
| * | Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux...Linus Torvalds2012-09-095-12/+120
| |\ \
| | * | ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMICHiroshi Doyu2012-08-281-0/+36
| | * | ARM: dma-mapping: Introduce __atomic_get_pages() for __iommu_get_pages()Hiroshi Doyu2012-08-281-0/+12
| | * | ARM: dma-mapping: Refactor out to introduce __in_atomic_poolHiroshi Doyu2012-08-281-6/+20
| | * | ARM: dma-mapping: atomic_pool with struct page **pagesHiroshi Doyu2012-08-281-3/+14
| | * | ARM: Kirkwood: increase atomic coherent pool sizeMarek Szyprowski2012-08-281-0/+7
| | * | ARM: DMA-Mapping: print warning when atomic coherent allocation failsMarek Szyprowski2012-08-281-0/+4
| | * | ARM: DMA-Mapping: add function for setting coherent pool size from platform codeMarek Szyprowski2012-08-282-1/+25
| | * | ARM: relax conditions required for enabling Contiguous Memory AllocatorMarek Szyprowski2012-08-281-1/+1
| | * | mm: cma: fix alignment requirements for contiguous regionsMarek Szyprowski2012-08-281-1/+1
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-09-094-2/+23
| |\ \ \
| | * | | Input: wacom - add support for EMR on Cintiq 24HD touchJason Gerecke2012-08-221-1/+5
| | * | | Input: i8042 - add Gigabyte T1005 series netbooks to noloop tableDmitry Torokhov2012-08-221-0/+14
| | * | | Input: imx_keypad - reset the hardware before enablingMichael Grzeschik2012-08-221-0/+3
| | * | | Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FSGuenter Roeck2012-08-221-1/+1
| * | | | Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2012-09-072-2/+6
| |\ \ \ \
| | * | | | HID: tpkbd: work even if the new Lenovo Keyboard driver is not configuredAndres Freund2012-09-071-1/+3
| | * | | | HID: Only dump input if someone is listeningHenrik Rydberg2012-09-021-1/+2
| | * | | | HID: add NOGET quirk for Eaton Ellipse MAX UPSAlan Stern2012-08-271-0/+1
| * | | | | Merge tag 'stable/for-linus-3.6-rc4-tag' of git://git.kernel.org/pub/scm/linu...Linus Torvalds2012-09-074-7/+7
| |\ \ \ \ \
| | * | | | | xen/pciback: Fix proper FLR steps.Konrad Rzeszutek Wilk2012-09-061-4/+4
| | * | | | | xen: Use correct masking in xen_swiotlb_alloc_coherent.Ronny Hegewald2012-09-051-1/+1
| | * | | | | xen: fix logical error in tlb flushingAlex Shi2012-09-051-1/+1
| | * | | | | Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus...Konrad Rzeszutek Wilk2012-09-056055-141649/+334864
| | |\ \ \ \ \
| | * | | | | | xen/p2m: Fix one-off error in checking the P2M tree directory.Konrad Rzeszutek Wilk2012-09-051-1/+1
| * | | | | | | Merge tag '3.6-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/he...Linus Torvalds2012-09-076-14/+92
| |\ \ \ \ \ \ \
| | * | | | | | | PCI: Don't print anything while decoding is disabledBjorn Helgaas2012-08-231-14/+17
| | * | | | | | | PCI/PM: Add ABI document for sysfs file d3cold_allowedHuang Ying2012-08-221-0/+12
| | * | | | | | | PCI/PM: Fix config reg access for D3cold and bridge suspendingHuang Ying2012-08-222-0/+51
| | * | | | | | | PCI/PM: Keep parent bridge active when probing deviceHuang Ying2012-08-221-0/+6