summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2010-08-0686-2742/+1120
|\
| * pcmcia: avoid buffer overflow in pcmcia_setup_isa_irqDominik Brodowski2010-08-031-1/+4
| * pcmcia: do not request windows if you don't need toDominik Brodowski2010-08-035-140/+5
| * pcmcia: insert PCMCIA device resources into resource treeDominik Brodowski2010-08-036-34/+60
| * pcmcia: export resource information to sysfsDominik Brodowski2010-08-031-0/+13
| * pcmcia: use struct resource for PCMCIA devices, part 2Dominik Brodowski2010-08-038-55/+48
| * pcmcia: remove memreq_tDominik Brodowski2010-08-0316-98/+41
| * pcmcia: move local definitions out of include/pcmcia/cs.hDominik Brodowski2010-08-032-0/+6
| * pcmcia: do not use io_req_t when calling pcmcia_request_io()Dominik Brodowski2010-08-0352-559/+495
| * pcmcia: do not use io_req_t after call to pcmcia_request_io()Dominik Brodowski2010-08-0349-238/+219
| * pcmcia: use struct resource for PCMCIA devicesDominik Brodowski2010-08-033-69/+93
| * pcmcia: clean up cs.hDominik Brodowski2010-08-031-0/+3
| * pcmcia: use pcmica_{read,write}_config_byteDominik Brodowski2010-08-0310-164/+102
| * pcmcia: remove cs_types.hDominik Brodowski2010-07-3082-98/+4
| * pcmcia: remove unused flag, simplify headersDominik Brodowski2010-07-302-11/+7
| * pcmcia: split up central event handlerDominik Brodowski2010-07-303-92/+54
| * pcmcia: simplify event callbackDominik Brodowski2010-07-302-40/+10
| * pcmcia: remove obsolete ioctlDominik Brodowski2010-07-307-1144/+6
* | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2010-08-0625-85/+433
|\ \
| * | PCI: update for owner removal from struct device_attributeStephen Rothwell2010-08-041-2/+2
| * | PCI: Fix warnings when CONFIG_DMI unsetNarendra K2010-08-021-2/+2
| * | PCI: Do not run NVidia quirks related to MSI with MSI disabledRafael J. Wysocki2010-07-301-0/+3
| * | PCI: use for_each_pci_dev()Kulikov Vasiliy2010-07-305-7/+6
| * | PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()Ben Hutchings2010-07-301-5/+42
| * | PCI: export SMBIOS provided firmware instance and label to sysfsNarendra K2010-07-305-0/+185
| * | PCI: Allow read/write access to sysfs I/O port resourcesAlex Williamson2010-07-301-0/+68
| * | PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}FUJITA Tomonori2010-07-301-4/+0
| * | PCI: disable mmio during bar sizingJacob Pan2010-07-302-0/+23
| * | PCI: MSI: Remove unsafe and unnecessary hardware accessBen Hutchings2010-07-301-23/+11
| * | PCI: Default PCIe ASPM control to on and require !EMBEDDED to disableMatthew Garrett2010-07-301-6/+14
| * | PCI: kernel oops on access to pci proc file while hot-removalKenji Kaneshige2010-07-301-2/+0
| * | PCI: pci-sysfs: remove casts from void*Kulikov Vasiliy2010-07-301-1/+1
| * | ACPI: Disable ASPM if the platform won't provide _OSC control for PCIeMatthew Garrett2010-07-301-0/+9
| * | PCI hotplug: make sure child bridges are enabled at hotplug timeYinghai Lu2010-07-301-5/+7
| * | PCI hotplug: shpchp: Removed check for hotplug of display devicesPraveen Kalamegham2010-07-301-15/+4
| * | PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_devicePraveen Kalamegham2010-07-301-1/+1
| * | PCI: Don't enable aspm before drivers have had a chance to veto itMatthew Garrett2010-07-301-2/+14
| * | PCI: fix wrong memory address handling in MSI-XKenji Kaneshige2010-07-301-1/+1
| * | PCI: check return value of pci_enable_device() when enabling bridgesJunchang Wang2010-07-301-0/+2
| * | PCI: sparse warning (trivial)Stephen Hemminger2010-07-301-1/+1
| * | PCI: disable MSI on VIA K8M800Tejun Heo2010-07-301-0/+1
| * | PCI quirk: AMD 780: work around wrong vendor ID on APC bridgeClemens Ladisch2010-07-301-3/+20
| * | PCI: hotplug/shpchp_hpc: add parenthesis in SLOT_REG_RSVDZ_MASKDan Carpenter2010-07-301-1/+1
| * | PCI aerdrv: fix annoying warningsLinus Torvalds2010-07-301-8/+9
| * | PCI: change device runtime PM settings for probe and removeAlan Stern2010-07-303-27/+37
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6Linus Torvalds2010-08-06811-33784/+106305
|\ \ \
| * | | Staging: wlan-ng: Update prism2_set_tx_power() to use mBmChristoph Fritz2010-08-051-4/+4
| * | | Staging: Merge staging-next into Linus's treeGreg Kroah-Hartman2010-08-05811-33784/+106305
| |\ \ \
| | * | | Staging: ti-st: update TODOPavan Savoy2010-08-021-17/+1
| | * | | Staging: wlags49_h2: use common PCI_VENDOR/DEVICE_ID name formatJavier Martinez Canillas2010-08-022-7/+11