summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
*-------. Merge branches 'amso1100', 'cma', 'cxgb4', 'misc', 'mlx4' and 'qib' into for-...Roland Dreier2011-01-296-25/+50
|\ \ \ \ \
| | | | | * IB/qib: Hold link for TX SERDES settingsMitko Haralanov2011-01-281-19/+11
| | | | * | mlx4_core: Add ConnectX-3 device IDsYevgeny Petrilin2011-01-281-0/+15
| | | | |/
| | | * / RDMA: Update missed conversion of flush_scheduled_work()Tejun Heo2011-01-281-1/+1
| | | |/
| | * | RDMA/cxgb4: Set the correct device physical function for iWARP connectionsSteve Wise2011-01-281-1/+1
| | * | RDMA/cxgb4: Limit MAXBURST EQ context field to 256BSteve Wise2011-01-281-2/+2
| | |/
| * / RDMA/ucma: Copy iWARP route information on queriesSteve Wise2011-01-281-2/+20
| |/
* / RDMA/amso1100: Fix compile warningsRalf Thielow2011-01-281-3/+3
|/
* staging: fix build failure in bcm driverAndres Salomon2011-01-172-7/+6
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2011-01-1735-137/+339
|\
| *-----. Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-nextRoland Dreier2011-01-1618-53/+288
| |\ \ \ \
| | | | | * IB/srp: Test only once whether iu allocation succeededBart Van Assche2011-01-131-8/+7
| | | | * | RDMA/nes: Fix incorrect SFP+ link status detection on driver initMaciej Sosnowski2011-01-161-4/+39
| | | | * | RDMA/nes: Fix SFP+ link down detection issue with switch port disableMaciej Sosnowski2011-01-164-0/+100
| | | | * | RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE eventsMaciej Sosnowski2011-01-164-9/+83
| | | | * | RDMA/nes: Fix bonding on iw_nesMaciej Sosnowski2011-01-162-6/+26
| | | | |/
| | | * / IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long)John L. Burr2011-01-115-6/+7
| | | |/
| | * | IB/mlx4: Handle protocol field in multicast tableAleksey Senin2011-01-122-14/+18
| | * | mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long)Roland Dreier2011-01-124-6/+8
| | |/
| * | RDMA: Update workqueue usageTejun Heo2011-01-1612-50/+36
| * | RDMA: Use vzalloc() to replace vmalloc()+memset(0)Joe Perches2011-01-128-34/+15
| |/
* | Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2011-01-172-8/+2
|\ \
| * | spi/spi_sh_msiof: fix a wrong free_irq() parameterGuennadi Liakhovetski2011-01-171-1/+1
| * | dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch()Grant Likely2011-01-151-7/+1
* | | Merge git://git.infradead.org/mtd-2.6Linus Torvalds2011-01-1739-316/+535
|\ \ \
| * | | mtd: mtdpart: disallow reading OOB past the end of the partitionArtem Bityutskiy2011-01-171-1/+18
| * | | mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probeDan Carpenter2011-01-061-1/+1
| * | | UBI: use mtd->writebufsize to set minimal I/O unit sizeAnatolij Gustschin2011-01-061-1/+27
| * | | mtd: initialize writebufsize in the MTD object of a partitionAnatolij Gustschin2011-01-062-0/+2
| * | | mtd: onenand: add mtd->writebufsize initializationAnatolij Gustschin2011-01-061-0/+1
| * | | mtd: nand: add mtd->writebufsize initializationAnatolij Gustschin2011-01-061-0/+1
| * | | mtd: cfi: add writebufsize initializationAnatolij Gustschin2011-01-063-0/+6
| * | | mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in useAdrian Hunter2011-01-061-1/+40
| * | | mtd: OneNAND: add enable / disable methods to onenand_chipAdrian Hunter2011-01-061-0/+4
| * | | mtd: m25p80: Fix JEDEC ID for AT26DF321Aleksandr Koltsoff2011-01-061-1/+1
| * | | mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)Ralf Rösch2011-01-061-2/+3
| * | | mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chipsGuillaume LECERF2011-01-061-1/+3
| * | | mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chipsGuillaume LECERF2011-01-061-3/+13
| * | | mtd: nand: ams-delta: drop omap_read/write, use ioremapJanusz Krzysztofik2011-01-061-6/+43
| * | | mtd: m25p80: add debugging trace in sst_writeNicolas Ferre2011-01-061-0/+4
| * | | mtd: nand: ams-delta: select for built-in by defaultJanusz Krzysztofik2011-01-061-0/+1
| * | | mtd: OneNAND: lighten scary initial bad block messagesAdrian Hunter2011-01-062-12/+14
| * | | mtd: OneNAND: OMAP2/3: add support for command line partitioningAdrian Hunter2011-01-061-15/+12
| * | | mtd: nand: rearrange ONFI revision checking, add ONFI 2.3Brian Norris2011-01-061-8/+12
| * | | mtd: nand: choose correct chip name (ONFI bug)Brian Norris2011-01-061-1/+1
| * | | mtd: nand: ams-delta: convert to platform driverJanusz Krzysztofik2011-01-061-5/+26
| * | | mtd: don't use flush_scheduled_work()Tejun Heo2011-01-061-1/+2
| * | | mtd: OneNAND: Fix multi block erase support at 4KiB pagesizeKyungmin Park2011-01-061-1/+2
| * | | Revert "mtd: nand: add check for out of page read"Artem Bityutskiy2011-01-061-8/+1
| * | | mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiBDavid Woodhouse2010-12-031-1/+1