git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e181c1 1ad8e7f)
Merge branch 'upstream'
authorJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 14:30:40 +0000 (10:30 -0400)
committerJeff Garzik <jeff@garzik.org>
Sun, 2 Apr 2006 14:30:40 +0000 (10:30 -0400)
Conflicts:

drivers/scsi/libata-core.c
drivers/scsi/pdc_adma.c
drivers/scsi/sata_mv.c
drivers/scsi/sata_nv.c
drivers/scsi/sata_promise.c
drivers/scsi/sata_qstor.c
drivers/scsi/sata_sx4.c
drivers/scsi/sata_vsc.c
include/linux/libata.h


Trivial merge
Pandora Kernel Repository