summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2008-10-11816-34474/+74162
|\
| * Merge phase #4 (X2APIC, APIC unification, CPU identification unification) of ...Linus Torvalds2008-10-117-314/+1139
| |\
| | * Merge branch 'x86/apic' into x86-v28-for-linus-phase4-BIngo Molnar2008-10-117-314/+1139
| | |\
| | | * Merge branch 'linus' into x86/coreIngo Molnar2008-08-14866-23061/+83525
| | | |\
| | | * \ Merge commit 'v2.6.27-rc1' into x86/coreIngo Molnar2008-07-30613-12233/+41714
| | | |\ \
| | | * \ \ Merge branch 'x86/x2apic' into x86/coreIngo Molnar2008-07-267-292/+1140
| | | |\ \ \
| | | | * \ \ Merge branch 'linus' into x86/x2apicIngo Molnar2008-07-25548-21661/+42124
| | | | |\ \ \
| | | | * \ \ \ Merge branch 'linus' into x86/x2apicIngo Molnar2008-07-221069-74271/+138582
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch 'linus' into x86/x2apicIngo Molnar2008-07-181134-97300/+55666Star
| | | | |\ \ \ \ \
| | | | * | | | | | x64, x2apic/intr-remap: MSI and MSI-X support for interrupt remapping infrast...Suresh Siddha2008-07-121-0/+11
| | | | * | | | | | x64, x2apic/intr-remap: IO-APIC support for interrupt-remappingSuresh Siddha2008-07-121-0/+10
| | | | * | | | | | x64, x2apic/intr-remap: disable DMA-remapping if Interrupt-remapping is detec...Suresh Siddha2008-07-121-0/+25
| | | | * | | | | | x64, x2apic/intr-remap: routines managing Interrupt remapping table entries.Suresh Siddha2008-07-122-0/+247
| | | | * | | | | | x64, x2apic/intr-remap: Interrupt remapping infrastructureSuresh Siddha2008-07-126-15/+187
| | | | * | | | | | x64, x2apic/intr-remap: Queued invalidation infrastructure (part of VT-d)Suresh Siddha2008-07-123-7/+211
| | | | * | | | | | x64, x2apic/intr-remap: move IOMMU_WAIT_OP() macro to intel-iommu.hSuresh Siddha2008-07-122-15/+15
| | | | * | | | | | x64, x2apic/intr-remap: parse ioapic scope under vt-d structuresSuresh Siddha2008-07-125-0/+83
| | | | * | | | | | x64, x2apic/intr-remap: Fix the need for RMRR in the DMA-remapping detectionSuresh Siddha2008-07-121-3/+1Star
| | | | * | | | | | x64, x2apic/intr-remap: use CONFIG_DMAR for DMA-remapping specific codeSuresh Siddha2008-07-121-11/+24
| | | | * | | | | | x64, x2apic/intr-remap: code re-structuring, to be used by both DMA and Inter...Suresh Siddha2008-07-123-22/+79
| | | | * | | | | | x64, x2apic/intr-remap: fix the need for sequential array allocation of iommusSuresh Siddha2008-07-123-21/+18Star
| | | | * | | | | | x64, x2apic/intr-remap: Intel vt-d, IOMMU code reorganizationSuresh Siddha2008-07-124-236/+264
| * | | | | | | | | Merge phase #3 (IOMMU) of git://git.kernel.org/pub/scm/linux/kernel/git/tip/l...Linus Torvalds2008-10-111-1/+1
| |\| | | | | | | |
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \
| | *---. \ \ \ \ \ \ \ Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for...Ingo Molnar2008-10-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | | * | | | | | | Merge branch 'linus' into x86/iommuIngo Molnar2008-09-1436-222/+469
| | | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge commit 'v2.6.27-rc6' into x86/iommuIngo Molnar2008-09-10511-6332/+7778
| | | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | | x86: blacklist DMAR on Intel G31/G33 chipsetsDavid Woodhouse2008-09-051-1/+1
| * | | | | | | | | | | | | Merge phase #2 (PAT updates) of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2008-10-1116-8/+152
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'linus' into x86/pat2Ingo Molnar2008-10-10188-1301/+2317
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.27-rc6' into x86/patIngo Molnar2008-09-14525-6361/+7814
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | linux-next: fix x86 tree build failureStephen Rothwell2008-08-251-1/+1
| | * | | | | | | | | | | | | agp: enable optimized agp_alloc_pages methodsRene Herman2008-08-2213-0/+30
| | * | | | | | | | | | | | | Merge branch 'x86/urgent' into x86/patIngo Molnar2008-08-22182-4607/+21001
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | agp: add agp_generic_destroy_pages()Shaohua Li2008-08-213-8/+63
| | * | | | | | | | | | | | | | agp: generic_alloc_pages()Shaohua Li2008-08-213-0/+59
| | * | | | | | | | | | | | | | Revert "reduce tlb/cache flush times of agpgart memory allocation"Ingo Molnar2008-08-212-7/+1Star
| | * | | | | | | | | | | | | | reduce tlb/cache flush times of agpgart memory allocationShaohua Li2008-08-152-1/+7
| * | | | | | | | | | | | | | | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-10-1154-1347/+3295
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.gitRussell King2008-10-0940-264/+477
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pxa-all' into develRussell King2008-10-0947-1330/+3209
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | [ARM] pxa: allow multi-machine PCMCIA buildsRussell King2008-10-071-9/+11
| | | * | | | | | | | | | | | | | | | [ARM] ohci-pxa27x: use ioremap() and offset for register accessEric Miao2008-10-071-79/+109
| | | * | | | | | | | | | | | | | | | [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()Eric Miao2008-10-071-4/+7
| | | * | | | | | | | | | | | | | | | [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resourceEric Miao2008-10-071-7/+17
| | | * | | | | | | | | | | | | | | | [ARM] ohci-pxa27x: move OHCI controller specific registers into the driverEric Miao2008-10-071-1/+72
| | | * | | | | | | | | | | | | | | | [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registersEric Miao2008-10-071-0/+37
| | | * | | | | | | | | | | | | | | | [ARM] pxa: simplify DMA register definitionsEric Miao2008-10-072-10/+10
| | | * | | | | | | | | | | | | | | | [ARM] pxa: move i2c register and bit definitions into i2c-pxa.cEric Miao2008-10-071-1/+38
| | | * | | | | | | | | | | | | | | | Merge branches 'pxa-core' and 'pxa-machines' into pxa-allRussell King2008-10-07324-5471/+8441
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-armRussell King2008-10-076-35/+215
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \