aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-07-245-11/+120
|\
| * pata_hpt37x: Fix 2.6.22 clock PLL regressionAlan Cox2007-07-241-7/+7
| * pata_ali: Correct HP detectAlan Cox2007-07-241-1/+1
| * ata_piix: fix suspend/resume for some TOSHIBA laptopsTejun Heo2007-07-241-2/+111
| * PCI: export __pci_reenable_device()Tejun Heo2007-07-242-1/+1
* | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2007-07-2418-309/+820
|\ \
| * | netdev: i82596 Ethernet needs <asm/cacheflush.h>Geert Uytterhoeven2007-07-241-0/+1
| * | forcedeth: mcp73 device additionAyaz Abdulla2007-07-241-0/+16
| * | atl1: make atl1_init_ring_ptrs staticChris Snook2007-07-241-1/+1
| * | eHEA: net_poll supportJan-Bernd Themann2007-07-242-2/+22
| * | drivers/net/acenic.c: fix check-after-useAdrian Bunk2007-07-241-6/+0
| * | defxx: Use __maybe_unused rather than a local hackMaciej W. Rozycki2007-07-241-9/+8
| * | Fix error checking in Vitesse IRQ configAndy Fleming2007-07-241-1/+1
| * | ps3: reduce allocation size of rx skb buffersMasakazu Mokuno2007-07-242-13/+44
| * | atl1: use kernel provided ethernet length constantsJay Cliburn2007-07-242-11/+7
| * | atl1: fix typo in dma_req_blockJay Cliburn2007-07-241-2/+2
| * | atl1: change cmb write thresholdJay Cliburn2007-07-241-1/+4
| * | atl1: fix typo in DMA engine setupJay Cliburn2007-07-241-2/+2
| * | atl1: change tpd_avail function nameJay Cliburn2007-07-241-2/+2
| * | ps3: fix rare issue that reenabling rx DMA failsMasakazu Mokuno2007-07-242-2/+8
| * | ps3: removed calling netif_poll_enable() in open()Masakazu Mokuno2007-07-241-1/+0
| * | ps3: use ethX as the name of irqMasakazu Mokuno2007-07-241-1/+1
| * | ps3: use net_device_stats of net_device structureMasakazu Mokuno2007-07-242-24/+8
| * | ps3: removed conditional ethtool supportMasakazu Mokuno2007-07-242-6/+0
| * | ps3: removed defines no longer usedMasakazu Mokuno2007-07-241-7/+0
| * | ps3: tx descriptor handling cleanupMasakazu Mokuno2007-07-241-53/+71
| * | ps3: some minor cleanupsMasakazu Mokuno2007-07-242-3/+3
| * | ps3: fix wrong calculation of rx descriptor addressMasakazu Mokuno2007-07-241-1/+1
| * | netxen: Load firmware during probe, dma watchdog fix.dhananjay@netxen.com2007-07-242-26/+25
| * | ucc_geth: add support to netif message levelLi Yang2007-07-241-125/+190
| * | ucc_geth: add ethtool supportLi Yang2007-07-245-14/+407
| |/
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp...Linus Torvalds2007-07-243-1/+27
|\ \
| * | [SPARC32]: Deal with rtc/sun_mostek_rtc conflict.Al Viro2007-07-243-1/+27
* | | aacraid: fix security holeAlan Cox2007-07-241-0/+4
* | | Merge branch 'request-queue-t' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2007-07-2460-154/+154
|\ \ \ | |/ / |/| |
| * | [BLOCK] Get rid of request_queue_t typedefJens Axboe2007-07-2460-154/+154
| |/
* | Fix failure exits in asus-laptopAl Viro2007-07-241-11/+21
* | Fix Au1100 fb dependencies, add helptextRalf Baechle2007-07-241-1/+8
* | Use resource_size_t for serial port IO addressesJosh Boyer2007-07-243-10/+14
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol...Linus Torvalds2007-07-2221-715/+802
|\
| * IB/ehca: Support small QP queuesStefan Roscher2007-07-2010-159/+378
| * IB/ehca: Make internal_create/destroy_qp() staticJoachim Fenkes2007-07-201-8/+9
| * IB/ehca: Move ehca2ib_return_code() out of lineHoang-Nam Nguyen2007-07-202-18/+18
| * IB/ehca: Generate async event when SRQ limit reachedHoang-Nam Nguyen2007-07-201-14/+28
| * IB/ehca: Support large page MRsHoang-Nam Nguyen2007-07-205-63/+357
| * IB/mlx4: Fix error path in create_qp_common()Roland Dreier2007-07-201-3/+5
| * mlx4_core: Change command token on timeoutRoland Dreier2007-07-201-2/+1
| * IB/mthca: Change command token on timeoutMichael S. Tsirkin2007-07-201-2/+1
| * IB/ipath: Remove ipath_layer dead codeArthur Jones2007-07-204-439/+0
| * IB/mlx4: Fix leaks in __mlx4_ib_modify_qpFlorin Malita2007-07-201-7/+5