summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparcLinus Torvalds2011-07-283-28/+36
|\
| * n2_crypto: Attach on Niagara-T3.David S. Miller2011-07-281-15/+18
| * n2rng: Attach on Niagara-T3.David S. Miller2011-07-282-13/+18
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2011-07-2823-224/+323
|\ \
| * | tg3: Remove 5719 jumbo frames and TSO blocksMatt Carlson2011-07-271-3/+3
| * | tg3: Break larger frags into 4k chunks for 5719Matt Carlson2011-07-272-6/+47
| * | tg3: Add tx BD budgeting codeMatt Carlson2011-07-271-20/+29
| * | tg3: Consolidate code that calls tg3_tx_set_bd()Matt Carlson2011-07-271-37/+42
| * | tg3: Add partial fragment unmapping codeMatt Carlson2011-07-272-0/+27
| * | tg3: Generalize tg3_skb_error_unmap()Matt Carlson2011-07-271-32/+16
| * | tg3: Remove short DMA check for 1st fragmentMatt Carlson2011-07-271-3/+0
| * | tg3: Simplify tx bd assignmentsMatt Carlson2011-07-271-39/+37
| * | tg3: Reintroduce tg3_tx_ring_infoMatt Carlson2011-07-272-7/+12
| * | ASIX: Use only 11 bits of header for data sizeMarek Vasut2011-07-271-2/+2
| * | ASIX: Simplify condition in rx_fixup()Marek Vasut2011-07-271-3/+2
| * | Fix cdc-phonet buildChris Clayton2011-07-271-0/+1
| * | bonding: reduce noise during initAndy Gospodarek2011-07-271-1/+1
| * | bonding: fix string comparison errorsAndy Gospodarek2011-07-271-62/+71
| * | net: Audit drivers to identify those needing IFF_TX_SKB_SHARING clearedNeil Horman2011-07-2710-6/+18
| * | forcedeth: fix vlansJiri Pirko2011-07-271-3/+13
| * | gianfar: fix bug caused by 87c288c6e9aa31720b72e2bc2d665e24e1653c3eSebastian Pöhn2011-07-271-5/+1
| * | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-07-274-4/+7
| |\ \
| | * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-07-264-4/+7
| | |\ \
| | | * | b43: fix invalid memory access in b43_ssb_remove()Pavel Roskin2011-07-261-2/+3
| | | * | b43: bcma: drop BROKENRafał Miłecki2011-07-261-1/+1
| | | * | b43: bus: fix memory corruption when setting driver's dataRafał Miłecki2011-07-261-0/+2
| | | * | NFC: pn533: use after free in pn533_disconnect()Dan Carpenter2011-07-261-1/+1
| * | | | drivers:connector:remove an unused variable *tracer*Wanlong Gao2011-07-251-1/+0
| * | | | acenic: use netdev_alloc_skb_ip_alignstephen hemminger2011-07-252-24/+27
* | | | | Merge branch 'for-linus' of git://neil.brown.name/mdLinus Torvalds2011-07-2810-1369/+3060
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | md/raid10: handle further errors during fix_read_error better.NeilBrown2011-07-281-15/+44
| * | | | md/raid10: Handle read errors during recovery better.NeilBrown2011-07-281-33/+121
| * | | | md/raid10: simplify read error handling during recovery.NeilBrown2011-07-281-5/+4
| * | | | md/raid10: record bad blocks due to write errors during resync/recovery.NeilBrown2011-07-281-10/+23
| * | | | md/raid10: attempt to fix read errors during resync/checkNeilBrown2011-07-281-4/+5
| * | | | md/raid10: Handle write errors by updating badblock log.NeilBrown2011-07-282-17/+117
| * | | | md/raid10: clear bad-block record when write succeeds.NeilBrown2011-07-282-12/+100
| * | | | md/raid10: avoid writing to known bad blocks on known bad drives.NeilBrown2011-07-281-12/+93
| * | | | md/raid10 record bad blocks as needed during recovery.NeilBrown2011-07-282-13/+36
| * | | | md/raid10: avoid reading known bad blocks during resync/recovery.NeilBrown2011-07-281-9/+35
| * | | | md/raid10 - avoid reading from known bad blocks - part 3NeilBrown2011-07-281-1/+6
| * | | | md/raid10: avoid reading from known bad blocks - part 2NeilBrown2011-07-281-5/+40
| * | | | md/raid10: avoid reading from known bad blocks - part 1NeilBrown2011-07-282-16/+129
| * | | | md/raid10: Split handle_read_error out from raid10d.NeilBrown2011-07-281-57/+66
| * | | | md/raid10: simplify/reindent some loops.NeilBrown2011-07-281-62/+65
| * | | | md/raid5: Clear bad blocks on successful write.NeilBrown2011-07-282-1/+19
| * | | | md/raid5. Don't write to known bad block on doubtful devices.NeilBrown2011-07-281-1/+30
| * | | | md/raid5: write errors should be recorded as bad blocks if possible.NeilBrown2011-07-282-10/+41
| * | | | md/raid5: use bad-block log to improve handling of uncorrectable read errors.NeilBrown2011-07-282-8/+53
| * | | | md/raid5: avoid reading from known bad blocks.NeilBrown2011-07-281-14/+32