Commit Graph

154 Commits

Author SHA1 Message Date
Jeff Garzik 54a86bfc3d Merge branch 'upstream-fixes' into upstream 2006-08-24 02:51:38 -04:00
Jeff Garzik f89b2b5ddc Merge branch 'upstream-fixes' into upstream
Conflicts:

	drivers/ata/ata_piix.c
2006-08-22 06:10:49 -04:00
Jeff Garzik 24dd01bfbc [libata] ata_piix: add missing kfree()
Noticed by Andrew Morton.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
2006-08-14 14:22:54 -04:00
Jeff Garzik c6fd280766 Move libata to drivers/ata. 2006-08-10 07:31:37 -04:00