Jeff Garzik c81e29b4ac Merge branch 'upstream-fixes' into upstream
Conflicts:

	drivers/scsi/libata-core.c
2006-05-24 01:49:12 -04:00
..
2006-04-11 06:18:46 -07:00
2006-05-03 20:05:41 -07:00
2006-05-24 01:34:10 -04:00
2006-05-21 12:59:18 -07:00
2006-04-11 06:18:43 -07:00
2006-05-21 12:59:22 -07:00
2006-05-15 11:20:55 -07:00
2006-05-21 20:08:56 -07:00
2006-05-03 20:05:41 -07:00
2006-05-21 12:59:20 -07:00
2006-05-21 12:59:17 -07:00
2006-05-21 12:59:22 -07:00
2006-04-21 10:59:00 -07:00