summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-10-2627-405/+474
|\
| * x86, ioapic: Consolidate the explicit EOI codeSuresh Siddha2011-09-211-74/+65
| * x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()Suresh Siddha2011-09-211-16/+27
| * x86, kdump, ioapic: Reset remote-IRR in clear_IO_APICSuresh Siddha2011-09-211-1/+47
| * iommu: Rename the DMAR and INTR_REMAP config optionsSuresh Siddha2011-09-2124-54/+60
| * x86, ioapic: Define irq_remap_modify_chip_defaults()Suresh Siddha2011-09-212-45/+23
| * x86, msi, intr-remap: Use the ioapic set affinity routineSuresh Siddha2011-09-211-42/+12
| * iommu: Cleanup ifdefs in detect_intel_iommu()Suresh Siddha2011-09-213-10/+12
| * iommu: No need to set dmar_disabled in check_zero_address()Suresh Siddha2011-09-211-3/+0
| * iommu: Move IOMMU specific code to intel-iommu.cSuresh Siddha2011-09-214-164/+180
| * intr_remap: Call dmar_dev_scope_init() explicitlySuresh Siddha2011-09-213-8/+22
| * x86, x2apic: Enable the bios request for x2apic optoutSuresh Siddha2011-09-215-28/+66
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-10-263-3/+4
|\ \
| * | caif: Fix BUG() with network namespacesDavid Woodhouse2011-10-251-2/+3
| * | net: make bonding slaves honour master's skb->priorityMaciej Żenczykowski2011-10-251-1/+0
| * | net: Unlock sock before calling sk_free()Thomas Gleixner2011-10-251-0/+1
* | | Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-10-26725-180469/+103925
|\ \ \
| * \ \ Merge branch 'staging-next' into Linux 3.1Greg Kroah-Hartman2011-10-25834-230470/+103926
| |\ \ \
| | * | | staging: et131x: Remove redundant check and return statementMark Einon2011-10-231-3/+0
| | * | | staging: et131x: Mainly whitespace changes to appease checkpatchMark Einon2011-10-231-35/+46
| | * | | staging: et131x: Remove last of the forward declarationsMark Einon2011-10-231-134/+128
| | * | | staging: et131x: Remove even more forward declarationsMark Einon2011-10-231-202/+193
| | * | | staging: et131x: Remove yet more forward declarationsMark Einon2011-10-231-220/+214
| | * | | staging: et131x: Remove more forward declarationsMark Einon2011-10-231-254/+251
| | * | | staging: et131x: Remove forward declaration of et131x_adapter_setupMark Einon2011-10-231-223/+222
| | * | | staging: et131x: Remove some forward declarationsMark Einon2011-10-231-66/+60
| | * | | staging: et131x: Remove unused rx_ring.recv_packet_poolMark Einon2011-10-231-2/+0
| | * | | staging: et131x: Remove call to find pci pm capabilityMark Einon2011-10-231-14/+0
| | * | | staging: et131x: Remove redundant et131x_reset_recv() callMark Einon2011-10-231-18/+0
| | * | | staging: et131x: Remove unused rx_ring.recv_buffer_poolMark Einon2011-10-231-6/+0
| | * | | Staging: bcm: Fix three initialization errors in InterfaceDld.cKevin McKinney2011-10-231-4/+5
| | * | | Staging: bcm: Fix coding style issues in InterfaceDld.cKevin McKinney2011-10-231-213/+161
| | * | | staging:iio:dac: Add AD5360 driverLars-Peter Clausen2011-10-233-0/+593
| | * | | staging:iio:trigger:bfin-timer: Fix compile errorLars-Peter Clausen2011-10-231-1/+1
| | * | | Staging: vt6655: add some range checks before memcpy()Dan Carpenter2011-10-231-0/+6
| | * | | Staging: vt6655: whitespace fixes to iotcl.cDan Carpenter2011-10-231-596/+491
| | * | | Staging: vt6656: add some range checks before memcpy()Dan Carpenter2011-10-231-0/+6
| | * | | Staging: vt6656: whitespace cleanups in ioctl.cDan Carpenter2011-10-231-552/+483
| | * | | staging: et131x: Remove unused definesMark Einon2011-10-231-11/+0
| | * | | staging: et131x: Convert rest of pci memory management to dma apiMark Einon2011-10-231-28/+28
| | * | | staging: et131x: on transmit, stop the queue if the next packet will failMark Einon2011-10-232-8/+6
| | * | | staging: et131x: Tidy up PCI device table definitionMark Einon2011-10-232-9/+4
| | * | | staging: et131x: Match dma_alloc_ calls with dma_free_ callsMark Einon2011-10-231-8/+8
| | * | | staging: et131x: use dma_alloc... instead of pci_alloc...Mark Einon2011-10-232-18/+22
| | * | | staging: et131x: Fix issues when USE_FBR0 is not definedMark Einon2011-10-232-147/+158
| | * | | staging: et131x: Make rx_ring.fbr{0,1} share a common structureMark Einon2011-10-231-153/+140
| | * | | staging: et131x: Moving two extern inline functions to .c fileMark Einon2011-10-232-10/+11
| | * | | staging: et131x: Update TODO list - remove 'put driver into single file'Mark Einon2011-10-231-1/+0
| | * | | staging: et131x: move et1310_tx.h contents into et131x.cMark Einon2011-10-232-151/+86
| | * | | staging: et131x: move et1310_rx.h contents into et131x.cMark Einon2011-10-232-244/+180