summaryrefslogtreecommitdiffstats
path: root/drivers (follow)
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linusJiri Kosina2009-12-078-17/+60
|\ \ \
| | | * HID: add multi-input quirk for NextWindow Touchscreen.Peter Hutterer2009-12-032-0/+4
| | | * HID: add support for Acan FG-8100 barcode readerJiri Kosina2009-12-023-0/+4
| | | * HID: make Media key on Logitech DiNovo Mini workJiri Kosina2009-11-251-0/+20
| | | * HID: pidff - fix unnecessary loop iterations on resetAnssi Hannula2009-11-041-3/+2
| | * | HID: support Logitech/3DConnexion SpaceTraveler and SpaceNavigatorJiri Kosina2009-11-133-0/+17
| | * | HID: fixup quirk for NCR devicesJiri Kosina2009-11-052-2/+3
| | * | HID: add NOGET quirk for another device from CH ProductsKeith Rutkowski2009-10-202-0/+2
| | * | HID: remove useless DRIVER_VERSION macroJiri Kosina2009-10-132-4/+1
| | * | HID: fix MODULE_AUTHOR usage in HID modulesJiri Kosina2009-10-132-3/+6
| | * | HID: blacklist Acer Ferrari 4005 optical mouseLamarque Vieira Souza2009-10-131-0/+1
| | |/
| * / HID: remove BKL from hiddev_ioctl_usage()Jiri Kosina2009-11-051-5/+0
| |/
* | Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2009-12-061-2/+3
|\ \
| * | x86: SGI UV: Fix irq affinity for hub based interruptsDimitri Sivanich2009-10-141-2/+3
| |/
* | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2009-12-061-9/+12
|\ \
| * \ Merge branch 'perf/mce' into perf/coreIngo Molnar2009-12-031-9/+12
| |\ \
| | | \
| | | \
| | *-. \ Merge branches 'x86/mce' and 'x86/urgent' into perf/mceIngo Molnar2009-10-16137-643/+11313
| | |\ \ \
| | | * | | mce, edac: Use an atomic notifier for MCEs decodingBorislav Petkov2009-10-121-9/+12
* | | | | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2009-12-053-6/+10
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'gart/fixes' into amd-iommu/2.6.33Joerg Roedel2009-11-271-2/+1
| |\ \ \ \ \ \
| | * | | | | | agp/amd64: Remove GART dependency on AGP_AMD64Pavel Vasilyev2009-10-291-2/+1
| * | | | | | | Merge commit 'v2.6.32-rc7' into core/iommuIngo Molnar2009-11-17143-1039/+1879
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | x86: Handle HW IOMMU initialization failure gracefullyFUJITA Tomonori2009-11-102-4/+5
| * | | | | | | x86: intel-iommu: Convert detect_intel_iommu to use iommu_init hookFUJITA Tomonori2009-11-101-0/+4
* | | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2009-12-052-2/+11
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into nextJames Morris2009-12-031258-32099/+96402
| |\ \ \ \ \ \ \ \
| * | | | | | | | | tpm: autoload tpm_tis based on system PnP IDsMatt Domsch2009-11-031-0/+1
| * | | | | | | | | tpm_tis: TPM_STS_DATA_EXPECT workaroundRajiv Andrade2009-11-011-1/+9
| * | | | | | | | | TPM: fix pcrreadRajiv Andrade2009-09-301-2/+1
| * | | | | | | | | Merge branch 'master' into nextJames Morris2009-09-293909-336147/+570381
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | TPM: increase default TPM bufferRajiv Andrade2009-09-241-1/+1
* | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6Linus Torvalds2009-12-05102-4495/+2997
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | pcmcia: rework the irq_req_t typedefDominik Brodowski2009-11-2851-124/+49
| * | | | | | | | | | pcmcia: remove deprecated handle_to_dev() macroDominik Brodowski2009-11-2824-28/+28
| * | | | | | | | | | pcmcia: pcmcia_request_window() doesn't need a pointer to a pointerDominik Brodowski2009-11-2818-26/+26
| * | | | | | | | | | pcmcia: remove unused "window_t" typedefDominik Brodowski2009-11-282-32/+32
| * | | | | | | | | | pcmcia: move some window-related code to pcmcia_ioctl.cDominik Brodowski2009-11-283-63/+55
| * | | | | | | | | | pcmcia: Change window_handle_t logic to unsigned longMagnus Damm2009-11-284-34/+35
| * | | | | | | | | | pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()Magnus Damm2009-11-283-2/+7
| * | | | | | | | | | pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()Magnus Damm2009-11-2818-24/+27
| * | | | | | | | | | pcmcia: Pass struct pcmcia_device to pcmcia_release_window()Magnus Damm2009-11-287-17/+18
| * | | | | | | | | | drivers/pcmcia: remove unnecessary kzallocJulia Lawall2009-11-221-4/+0
| * | | | | | | | | | pcmcia: correct handling for Zoomed Video registers in topic.hAvi Cohen Stuart2009-11-111-10/+5
| * | | | | | | | | | pcmcia: fix printk formatsRandy Dunlap2009-11-111-2/+2
| * | | | | | | | | | pcmcia: autoload module pcmciaDominik Brodowski2009-11-091-0/+7
| * | | | | | | | | | pcmcia/staging: update comedi driversDominik Brodowski2009-11-097-1035/+424
| * | | | | | | | | | PCMCIA: stop duplicating pci_irq in soc_pcmcia_socketRussell King - ARM Linux2009-11-0919-24/+23
| * | | | | | | | | | PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socketRussell King - ARM Linux2009-11-093-3/+0
| * | | | | | | | | | PCMCIA: soc_common: constify soc_pcmcia_socket ops memberRussell King - ARM Linux2009-11-091-1/+1
| * | | | | | | | | | PCMCIA: sa1111: remove duplicated initializersRussell King - ARM Linux2009-11-096-43/+17