summaryrefslogtreecommitdiffstats
path: root/include/linux
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi...Linus Torvalds2006-01-051-6/+7
|\
| * Merge branch 'master'Jeff Garzik2006-01-037-10/+24
| |\
| * \ Merge branch 'master'Jeff Garzik2005-12-245-129/+11Star
| |\ \
| * \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-12-131-0/+1
| |\ \ \
| * \ \ \ Merge branch 'master'Jeff Garzik2005-12-131-0/+30
| |\ \ \ \
| * | | | | [PATCH] libata: remove unused qc->waitingTejun Heo2005-12-131-2/+0Star
| * | | | | [PATCH] libata: implement ata_exec_internal()Tejun Heo2005-12-131-0/+2
| * | | | | Merge branch 'master'Jeff Garzik2005-12-1315-98/+137
| |\ \ \ \ \
| * | | | | | [PATCH] libata: move err_mask to ata_queued_cmdAlbert Lee2005-12-061-2/+5
| * | | | | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-041-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-12-014-14/+34
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-2917-86/+49Star
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-203-28/+6Star
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-193-2/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-183-0/+121
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-fixes'Jeff Garzik2005-11-171-0/+67
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-1628-135/+240
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [libata] remove two unused fields from struct ata_portJeff Garzik2005-11-151-2/+0Star
* | | | | | | | | | | | | | | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-01-051-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2006-01-037-10/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-241-3/+2Star
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-194-126/+9Star
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-12-141-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'upstream-fixes'Jeff Garzik2005-12-131-0/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-1215-98/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-041-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | [PATCH] sky2: change netif_rx_schedule_test to __netif_schedule_prepshemminger@osdl.org2005-12-011-4/+4
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-12-014-14/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-2917-86/+49Star
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-203-28/+6Star
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-193-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-186-1/+203
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-1531-138/+251
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bonding-sysfs' of git://git.tuxdriver.com/git/netdev-jwlJeff Garzik2005-11-151-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | [PATCH] net: make dev_valid_name publicMitch Williams2005-11-131-0/+1
| * | | | | | | | | | | | | | | | | | Merge branch 'sky2'Jeff Garzik2005-11-121-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'master'Jeff Garzik2005-11-11116-881/+2893
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-11-0579-909/+2385
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master'Jeff Garzik2005-10-2889-648/+1085
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge /spare/repo/linux-2.6/Jeff Garzik2005-09-2225-96/+780
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | [PATCH] sky2: driver update.Stephen Hemminger2005-09-161-2/+6
* | | | | | | | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6Linus Torvalds2006-01-053-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge by hand (conflicts in scsi_lib.c)James Bottomley2005-12-163-125/+8Star
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | [SCSI] seperate max_sectors from max_hw_sectorsMike Christie2005-12-161-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | [SCSI] add retries field to request for REQ_BLOCK_PC useMike Christie2005-12-151-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | [SCSI] Convert SCSI mid-layer to scsi_execute_asyncMike Christie2005-12-151-0/+2
| * | | | | | | | | | | | | | | | | | | | | | | | [SCSI] export blk layer functions needed for blk_execute_rq_nowaitMike Christie2005-12-151-0/+5
| * | | | | | | | | | | | | | | | | | | | | | | | [SCSI] pci_ids.h: add subclass code for SAS ControllersMoore, Eric Dean2005-12-141-0/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-01-0517-181/+266
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | [NET]: Don't exclude broadcast addresses from is_multicast_ether_addr()Stephen Hemminger2006-01-041-1/+2