aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...Linus Torvalds2006-01-0415-252/+412
|\
| * Merge branch 'master'Jeff Garzik2006-01-03147-894/+1194
| |\
| * \ Merge branch 'master'Jeff Garzik2005-12-24119-1509/+1172
| |\ \
| * \ \ Merge branch 'master'Jeff Garzik2005-12-133-4/+5
| |\ \ \
| * | | | [PATCH] add boot option to control Intel SATA/PATA combined modeJesse Barnes2005-12-132-0/+38
| * | | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-135-10/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'master'Jeff Garzik2005-12-1321-99/+307
| |\ \ \ \ \
| * | | | | | [PATCH] libata: remove unused qc->waitingTejun Heo2005-12-132-14/+2
| * | | | | | [PATCH] libata: remove unused functionsTejun Heo2005-12-132-30/+0
| * | | | | | [PATCH] libata: use ata_exec_internal()Tejun Heo2005-12-131-101/+44
| * | | | | | [PATCH] libata: implement ata_exec_internal()Tejun Heo2005-12-132-0/+101
| * | | | | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-1217-113/+341
| |\ \ \ \ \ \
| * | | | | | | [PATCH] libata: ata_piix 450NX errataAlan Cox2005-12-121-1/+43
| * | | | | | | Merge branch 'master'Jeff Garzik2005-12-12198-3600/+3843
| |\ \ \ \ \ \ \
| * | | | | | | | [PATCH] libata: add ata_piix notesAlan Cox2005-12-121-0/+43
| * | | | | | | | [PATCH] libata: err_mask misc fixAlbert Lee2005-12-061-5/+13
| * | | | | | | | [PATCH] libata: determine the err_mask directly in atapi_packet_task()Albert Lee2005-12-061-6/+7
| * | | | | | | | [PATCH] libata: determine the err_mask when the error is foundAlbert Lee2005-12-061-1/+9
| * | | | | | | | [PATCH] libata: move err_mask to ata_queued_cmdAlbert Lee2005-12-0611-56/+86
| * | | | | | | | [PATCH] libata: minor patch before moving err_maskAlbert Lee2005-12-061-3/+7
| * | | | | | | | Merge branch 'master'Jeff Garzik2005-12-064-11/+12
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-12-03179-4986/+4550
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [PATCH] mark several libata datastructures constArjan van de Ven2005-12-018-11/+11
| * | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-01112-645/+1134
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [libata sata_promise] minor whitespace cleanupJeff Garzik2005-11-301-2/+2
| * | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-29280-2869/+3370
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [libata] Print out SATA speed, if link is upJeff Garzik2005-11-201-4/+16
| * | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-2060-693/+470
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-1873-1202/+1675
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-18240-8387/+3858
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-1753-580/+1708
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-1610-24/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-15451-14550/+13491
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-151-10/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | [libata ata_piix] cleanup: remove duplicate ata_port_info recordsJeff Garzik2005-11-141-33/+7
| * | | | | | | | | | | | | | | | | | | [libata] remove two unused fields from struct ata_portJeff Garzik2005-11-141-2/+0
* | | | | | | | | | | | | | | | | | | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-01-0467-2390/+11404
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2006-01-03147-894/+1194
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | [PATCH] sky2: version 0.11Stephen Hemminger2005-12-241-1/+1
| * | | | | | | | | | | | | | | | | | | | [PATCH] sky2: handle hardware packet overrunStephen Hemminger2005-12-241-0/+9
| * | | | | | | | | | | | | | | | | | | | [PATCH] sky2: don't lose multicast addressesStephen Hemminger2005-12-241-2/+2
| * | | | | | | | | | | | | | | | | | | | [PATCH] sky2: handle out of memory on admin changesStephen Hemminger2005-12-241-32/+52
| * | | | | | | | | | | | | | | | | | | | [PATCH] skge: error handling on resumeStephen Hemminger2005-12-241-2/+2
| * | | | | | | | | | | | | | | | | | | | [PATCH] spidernet: fix Kconfig after BPA->CELL renameJens Osterkamp2005-12-241-1/+1
| * | | | | | | | | | | | | | | | | | | | [PATCH] git-netdev-all: s2io warning fixAndrew Morton2005-12-241-5/+11
| * | | | | | | | | | | | | | | | | | | | [PATCH] skge: version number (1.3)Stephen Hemminger2005-12-241-1/+1
| * | | | | | | | | | | | | | | | | | | | [PATCH] skge: handle out of memory on ring parameter changeStephen Hemminger2005-12-241-1/+4
| * | | | | | | | | | | | | | | | | | | | [PATCH] skge: get rid of Yukon2 definesStephen Hemminger2005-12-241-72/+1
| * | | | | | | | | | | | | | | | | | | | [PATCH] skge: handle out of memory on MTU size changesStephen Hemminger2005-12-241-6/+16
| * | | | | | | | | | | | | | | | | | | | [PATCH] skge: avoid up/down on pause param changesStephen Hemminger2005-12-241-4/+2