projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c2a6585
a145410
)
Merge branch 'master'
author
Jeff Garzik
<jeff@garzik.org>
Tue, 11 Apr 2006 16:51:40 +0000
(12:51 -0400)
committer
Jeff Garzik
<jeff@garzik.org>
Tue, 11 Apr 2006 16:51:40 +0000
(12:51 -0400)
Conflicts:
drivers/scsi/libata-scsi.c
include/linux/libata.h
17 files changed:
1
2
drivers/scsi/ahci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/ata_piix.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/libata-scsi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/pdc_adma.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_mv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_nv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_promise.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_qstor.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_sil.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_sil24.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_sis.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_svw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_sx4.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_uli.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_via.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/sata_vsc.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/libata.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/scsi/ahci.c
Simple merge
diff --cc
drivers/scsi/ata_piix.c
Simple merge
diff --cc
drivers/scsi/libata-scsi.c
Simple merge
diff --cc
drivers/scsi/pdc_adma.c
Simple merge
diff --cc
drivers/scsi/sata_mv.c
Simple merge
diff --cc
drivers/scsi/sata_nv.c
Simple merge
diff --cc
drivers/scsi/sata_promise.c
Simple merge
diff --cc
drivers/scsi/sata_qstor.c
Simple merge
diff --cc
drivers/scsi/sata_sil.c
Simple merge
diff --cc
drivers/scsi/sata_sil24.c
Simple merge
diff --cc
drivers/scsi/sata_sis.c
Simple merge
diff --cc
drivers/scsi/sata_svw.c
Simple merge
diff --cc
drivers/scsi/sata_sx4.c
Simple merge
diff --cc
drivers/scsi/sata_uli.c
Simple merge
diff --cc
drivers/scsi/sata_via.c
Simple merge
diff --cc
drivers/scsi/sata_vsc.c
Simple merge
diff --cc
include/linux/libata.h
Simple merge