Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:45:13 +0000 (08:45 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 4 Apr 2006 12:45:13 +0000 (08:45 -0400)
commit79fa1b677be3a985cc66b9218a4dd09818f1051b
treed36030be7cd07461055f005394ef275212353010
parent31ce6daefe2d312e31ee06b0b3301b1cb7878c04
parentc2a6585296009379e0f4eff39cdcb108b457ebf2
Merge branch 'upstream'
drivers/scsi/libata-core.c
include/linux/libata.h