aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-03-1612-48/+102
|\
| *---. Merge branches 'cma', 'cxgb4', 'ipath' and 'qib' into for-nextRoland Dreier2011-03-1510-20/+52
| |\ \ \
| | | | * IB/qib: Fix M_Key field in SubnGet and SubnGetResp MADsMitko Haralanov2011-03-141-2/+3
| | | | * IB/qib: Set default LE2 value for active cables to 0Mitko Haralanov2011-03-142-3/+12
| | | | * IB/qib: Return correct MAD when setting link width to 255Mitko Haralanov2011-02-221-3/+4
| | | * | IB/ipath: Don't reset disabled devicesNicolas Kaiser2011-03-141-0/+1
| | | |/
| | * | RDMA/cxgb4: Debugfs dump_qp() updatesSteve Wise2011-03-141-4/+9
| | * | RDMA/cxgb4: Dispatch FATAL event on EEH errorsSteve Wise2011-03-141-1/+9
| | * | RDMA/cxgb4: Use ULP_MODE_TCPDDPSteve Wise2011-03-142-0/+3
| | * | RDMA/cxgb4: Enable on-chip SQ support by defaultSteve Wise2011-03-141-2/+2
| | * | RDMA/cxgb4: Do CIDX_INC updates every 1/16 CQ depth CQE reapsSteve Wise2011-03-141-1/+7
| | * | RDMA/cxgb4: Remove db_drop_taskSteve Wise2011-03-142-2/+0
| | * | RDMA/cxgb4: Turn on delayed ACKSteve Wise2011-03-141-2/+2
| | |/
| * | RDMA/cma: Replace global lock in rdma_destroy_id() with id-specific oneSean Hefty2011-03-151-27/+16
| * | IB/cm: Cancel pending LAP message when exiting IB_CM_ESTABLISH stateSean Hefty2011-03-151-1/+18
| * | IB/cm: Bump reference count on cm_id before invoking callbackSean Hefty2011-03-151-0/+1
| * | RDMA/cma: Fix crash in request handlersSean Hefty2011-03-151-0/+15
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2011-03-1611-16/+2254
|\ \
| * | random: update interface comments to reflect realityJarod Wilson2011-02-211-3/+10
| * | crypto: picoxcell - add support for the picoxcell crypto enginesJamie Iles2011-02-214-1/+2013
| * | hwrng: omap - Convert release_resource to release_region/release_mem_regionJulia Lawall2011-02-161-8/+6
| * | crypto: omap-sham - don't treat NULL clk as an errorJamie Iles2011-01-291-2/+2
| * | crypto: omap-aes - don't treat NULL clk as an errorJamie Iles2011-01-291-2/+2
| * | hwrng: pixocell - add support for picoxcell TRNGJamie Iles2011-01-233-0/+221
* | | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2011-03-1652-182/+1356
|\ \ \
| * | | ahci: add another PCI ID for marvellTejun Heo2011-03-151-0/+2
| * | | sata_fsl: Update RX_WATER_MARK for TRANSCFGPrabhakar Kushwaha2011-03-141-0/+12
| * | | sata_fsl: Fix wrong Device Error Register usagePrabhakar Kushwaha2011-03-141-2/+5
| * | | libata: Include WWN ID in inquiry VPD emulationHannes Reinecke2011-03-141-0/+11
| * | | ata/pata_arasan_cf: fill dma chan->private from pdata->dma_privViresh Kumar2011-03-141-1/+6
| * | | ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level>Joe Perches2011-03-143-20/+23
| * | | pata_arasan_cf: fix printk format string warningJeff Garzik2011-03-141-1/+2
| * | | pata_arasan_cf: Adding support for arasan compact flash host controllerViresh Kumar2011-03-143-0/+984
| * | | libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work()Viresh Kumar2011-03-141-2/+13
| * | | ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controllerSeth Heasley2011-03-141-0/+1
| * | | ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controllerPer Jessen2011-03-021-0/+2
| * | | libata: remove ATA_FLAG_LPMSergei Shtylyov2011-03-021-2/+1
| * | | libata: remove ATA_FLAG_NO_LEGACYSergei Shtylyov2011-03-0227-62/+43
| * | | libata: remove ATA_FLAG_MMIOSergei Shtylyov2011-03-0228-48/+33
| * | | libata: remove ATA_FLAG_{SRST|SATA_RESET}Sergei Shtylyov2011-03-025-8/+8
| * | | ipr/sas_ata: use mode mask macros from <linux/ata.h>Sergei Shtylyov2011-03-022-5/+5
| * | | sata_dwc_460ex: add debugging optionsSergei Shtylyov2011-03-021-0/+12
| * | | sata_dwc_460ex: fix misuse of ata_get_cmd_descript()Sergei Shtylyov2011-03-021-10/+46
| * | | sata_dwc_460ex: fix return value of dma_dwc_xfer_setup()Sergei Shtylyov2011-03-021-2/+2
| * | | sata_dwc_460ex: fix compilation errors/warningsSergei Shtylyov2011-03-021-6/+8
| * | | sata_dwc_460ex: use ATA_PIO4Sergei Shtylyov2011-03-021-1/+1
| * | | [libata] trivial: trim trailing whitespace for drivers/ata/*.[ch]Jeff Garzik2011-03-029-14/+14
| * | | libsas: convert to libata new error handlerJames Bottomley2011-03-022-8/+93
| * | | libata: separate error handler into usable componentsJames Bottomley2011-03-021-9/+44
| * | | libata: fix eh lockingJames Bottomley2011-03-021-2/+7