Jeff Garzik 3d71b3b0b6 Merge branch 'upstream-fixes' into upstream
Conflicts:

	drivers/scsi/libata-core.c
2006-05-20 00:36:08 -04:00
..
2006-04-11 06:18:46 -07:00
2006-05-03 20:05:41 -07:00
2006-05-15 11:20:57 -07:00
2006-04-11 06:18:43 -07:00
2006-05-15 11:20:54 -07:00
2006-05-15 11:20:55 -07:00
2006-05-16 11:28:49 +01:00
2006-05-03 20:05:41 -07:00
2006-03-23 07:38:16 -08:00
2006-05-12 11:58:10 -07:00
2006-03-24 18:23:14 +01:00
2006-04-21 10:59:00 -07:00