summaryrefslogtreecommitdiffstats
path: root/drivers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge by hand (whitespace conflicts in libata.h)James Bottomley2005-11-10335-10090/+31203
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6Linus Torvalds2005-11-1012-18/+338
| |\
| | * [PATCH] ide-floppy: software eject not working with LS-120 driveOndrej Zary2005-11-101-4/+2
| | * [PATCH] siimage: enable interrupts on Adaptec SA-1210 cardJohn W. Linville2005-11-101-0/+9
| | * [PATCH] ide: CS5535 driverJaya Kumar2005-11-093-0/+315
| | * [PATCH] ide: AMD Geode GX/LX supportJordan Crouse2005-11-091-0/+3
| | * [PATCH] ide: ide-scsi fails to call idescsi_check_condition for things like "...Willem Riede2005-11-091-2/+3
| | * [PATCH] ide: possible cleanupsAdrian Bunk2005-11-093-9/+1
| | * [PATCH] ide: incorrect device link for ide-csHannes Reinecke2005-11-092-3/+5
| * | Fix AGP compile on non-x86 architecturesLinus Torvalds2005-11-092-6/+4
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6Linus Torvalds2005-11-093-27/+20
| |\ \
| | * | [PATCH] i2c-viapro: Some adjustmentsJean Delvare2005-11-081-13/+14
| | * | [PATCH] hwmon: Fix two w83627hf bugsYuan Mu2005-11-081-12/+4
| | * | [PATCH] i2c: ds1337 BCD conversion fixJames Chapman2005-11-081-2/+2
| * | | [SPARC] sbus rtc: implement ->compat_ioctlChristoph Hellwig2005-11-091-0/+22
| * | | [SPARC]: Fix locking thinkos in display7seg and cpwatchdog drivers.David S. Miller2005-11-092-2/+2
| | |/ | |/|
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgartLinus Torvalds2005-11-094-12/+30
| |\ \
| | * | [PATCH] i460-agp warning fixesAndrew Morton2005-11-081-3/+5
| | * | [PATCH] AGP performance fixesAlan Hourihane2005-11-084-9/+25
| * | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2005-11-0917-40/+30
| |\ \ \
| | * | | [PATCH] libata: if condition fix for ata_dev_identify()Albert Lee2005-11-091-3/+2
| | * | | [PATCH] libata kernel-doc fixesRandy Dunlap2005-11-092-5/+6
| | * | | Merge branch 'master'Jeff Garzik2005-11-09542-20031/+26266
| | |\ \ \
| | * | | | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/definesJeff Garzik2005-11-0717-32/+22
| * | | | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2005-11-0924-3276/+7801
| |\ \ \ \ \
| | * | | | | [PATCH] IOC: And don't mark the things as broken Cowboy.Ralf Baechle2005-11-091-1/+1
| | * | | | | [PATCH] dgrs: fix warnings when CONFIG_ISA and CONFIG_PCI are not enabledAshutosh Naik2005-11-091-9/+7
| | * | | | | [PATCH] cris v10 eth: use ethtool_opsChristoph Hellwig2005-11-091-78/+71
| | * | | | | [PATCH] b44: increase version numberFrancois Romieu2005-11-091-2/+2
| | * | | | | [PATCH] b44: race on device closingFrancois Romieu2005-11-091-0/+11
| | * | | | | [PATCH] b44: replace B44_FLAG_INIT_COMPLETE with netif_running()Francois Romieu2005-11-092-5/+2
| | * | | | | [wireless ipw2100] kill unused-var warnings for debug-disabled codeJeff Garzik2005-11-091-0/+4
| | * | | | | Merge rsync://bughost.org/repos/ipw-delta/Jeff Garzik2005-11-094-2895/+7307
| | |\ \ \ \ \
| | | * | | | | Update version ipw2200 stamp to 1.0.8James Ketrenos2005-11-081-1/+1
| | | * | | | | Updated firmware version stamp to 2.4 from 2.3 so it will use the latest firm...James Ketrenos2005-11-081-1/+1
| | | * | | | | Fixed parameter reordering in firmware log routine.James Ketrenos2005-11-081-1/+1
| | | * | | | | Fixed problem with not being able to send broadcast packets.Hong Liu2005-11-081-3/+6
| | | * | | | | Added channel support for ipw2200 cards identified as 'ZZR'James Ketrenos2005-11-081-1/+17
| | | * | | | | Removed warning about TKIP not being configured if countermeasures areJames Ketrenos2005-11-082-16/+4
| | | * | | | | Fixes missed beacon logic in relation to on-network AP roaming.Ben Cahill2005-11-082-7/+23
| | | * | | | | Removed legacy WIRELESS_EXT checks from ipw2200.cJames Ketrenos2005-11-081-507/+1
| | | * | | | | Fix 'Driver using old /proc/net/wireless support, please fix driver !' message.Benoit Boissinot2005-11-082-7/+14
| | | * | | | | Pulled out a stray KERNEL_VERSION check around the suspend handler.James Ketrenos2005-11-081-4/+0
| | | * | | | | Updated driver version stamps for ipw2100 (1.1.3) and ipw2200 (1.0.7)James Ketrenos2005-11-082-2/+2
| | | * | | | | Fixes WEP firmware error condition.Hong Liu2005-11-081-18/+13
| | | * | | | | [Fix bug# 771] Too many (8) bytes recieved when using AES/hwcryptoZhu Yi2005-11-081-8/+2
| | | * | | | | Fixes problem with WEP not working (association succeeds, but no Tx/Rx)Hong Liu2005-11-081-0/+2
| | | * | | | | Removed PF_SYNCTHREAD legacy.James Ketrenos2005-11-081-4/+1
| | | * | | | | Fixed problem with get_cmd_string not existing if CONFIG_IPW_DEBUG disabled.James Ketrenos2005-11-081-2/+0
| | | * | | | | Card with WEP enabled and using shared-key auth will have firmwareHong Liu2005-11-081-0/+10