summaryrefslogtreecommitdiffstats
path: root/include/linux
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pci-v3.14-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-01-223-264/+109
|\
| * Merge branch 'pci/reset' into nextBjorn Helgaas2014-01-151-0/+3
| |\
| | * PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()Alex Williamson2014-01-141-0/+3
| * | PCI: Add global pci_lock_rescan_remove()Rafael J. Wysocki2014-01-131-0/+3
| |/
| * PCI: Cleanup pci.h whitespaceBjorn Helgaas2014-01-131-184/+54
| * PCI: Reorder so actual code comes before stubsBjorn Helgaas2014-01-131-23/+23
| * Merge branch 'pci/dead-code' into nextBjorn Helgaas2014-01-132-60/+0
| |\
| | * PCI: Make local functions staticStephen Hemminger2014-01-131-5/+0
| | * PCI: Remove unused alloc_pci_dev()Stephen Hemminger2014-01-131-1/+0
| | * PCI: Remove unused pci_renumber_slot()Stephen Hemminger2014-01-131-1/+0
| | * PCI: Remove unused pcie_aspm_enabled()Stephen Hemminger2014-01-131-2/+0
| | * PCI: Remove unused pci_vpd_truncate()Stephen Hemminger2014-01-131-1/+0
| | * PCI: Remove unused ID-Based Ordering supportStephen Hemminger2014-01-101-13/+0
| | * PCI: Remove unused Optimized Buffer Flush/Fill supportStephen Hemminger2014-01-101-16/+0
| | * PCI: Remove unused Latency Tolerance Reporting supportStephen Hemminger2014-01-101-4/+0
| | * PCI: Removed unused parts of Page Request Interface supportStephen Hemminger2014-01-101-17/+0
| * | Merge branch 'pci/resource' into nextBjorn Helgaas2014-01-101-8/+12
| |\ \
| | * | PCI: Enforce bus address limits in resource allocationYinghai Lu2014-01-071-4/+0
| | * | PCI: Add pci_bus_address() to get bus address of a BARBjorn Helgaas2013-12-211-0/+8
| | * | PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_devYinghai Lu2013-12-211-2/+2
| | * | PCI: Change pci_bus_region addresses to dma_addr_tBjorn Helgaas2013-12-211-2/+2
| | |/
| * | Merge branch 'pci/msi' into nextBjorn Helgaas2014-01-071-7/+20
| |\ \
| | * | PCI/MSI: Add pci_enable_msi_range() and pci_enable_msix_range()Alexander Gordeev2014-01-031-0/+14
| | * | PCI/MSI: Add pci_msix_vec_count()Alexander Gordeev2014-01-031-3/+3
| | * | PCI/MSI: Remove pci_enable_msi_block_auto()Alexander Gordeev2014-01-031-7/+0
| | * | PCI/MSI: Add pci_msi_vec_count()Alexander Gordeev2014-01-031-0/+6
| * | | Merge branch 'pci/misc' into nextBjorn Helgaas2013-12-201-2/+1
| |\ \ \
| | * | | PCI/checkpatch: Deprecate DEFINE_PCI_DEVICE_TABLEJoe Perches2013-12-131-2/+1
| * | | | Merge branch 'pci/msi' into nextBjorn Helgaas2013-12-201-8/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | PCI/MSI: Make pci_enable_msi/msix() 'nvec' argument type as intAlexander Gordeev2013-12-201-4/+4
| | * | | PCI/MSI: Return -ENOSYS for unimplemented interfaces, not -1Alexander Gordeev2013-12-201-3/+3
| | * | | PCI/MSI: Export MSI mode using attributes, not kobjectsGreg Kroah-Hartman2013-12-191-1/+1
| | | |/ | | |/|
| * | | Merge branch 'pci/vc' into nextBjorn Helgaas2013-12-181-1/+14
| |\ \ \
| | * | | PCI: Add Virtual Channel to save/restore supportAlex Williamson2013-12-171-0/+5
| | * | | PCI: Add support for save/restore of extended capabilitiesAlex Williamson2013-12-171-1/+8
| | * | | PCI: Add pci_wait_for_pending() (refactor pci_wait_for_pending_transaction())Alex Williamson2013-12-171-0/+1
| | |/ /
| * | | Merge branch 'pci/misc' into nextBjorn Helgaas2013-12-131-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | PCI: Drop "irq" param from *_restore_msi_irqs()DuanZhenzhong2013-12-131-2/+2
| | |/
* | | Merge tag 'trace-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2014-01-222-2/+139
|\ \ \
| * | | tracing: Consolidate event trigger codeSteven Rostedt (Red Hat)2014-01-091-0/+117
| * | | tracing: Add generic tracing_lseek() functionSteven Rostedt (Red Hat)2014-01-021-2/+0
| * | | tracing: Add and use generic set_trigger_filter() implementationTom Zanussi2013-12-211-1/+8
| * | | tracing: Add 'enable_event' and 'disable_event' event trigger commandsTom Zanussi2013-12-211-0/+1
| * | | tracing: Add 'stacktrace' event trigger commandTom Zanussi2013-12-211-0/+1
| * | | tracing: Add 'snapshot' event trigger commandTom Zanussi2013-12-211-0/+1
| * | | tracing: Add 'traceon' and 'traceoff' event trigger commandsTom Zanussi2013-12-201-0/+1
| * | | tracing: Add basic event trigger frameworkTom Zanussi2013-12-201-0/+11
* | | | Merge branch 'akpm' (incoming from Andrew)Linus Torvalds2014-01-2117-243/+388
|\ \ \ \
| * | | | mm/migrate: remove unused function, fail_migrate_page()Joonsoo Kim2014-01-211-4/+0
| * | | | mm/migrate: remove putback_lru_pages, fix comment on putback_movable_pagesJoonsoo Kim2014-01-211-2/+0