git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
98a5d02
b71d4da
)
Merge branch 'upstream'
author
Jeff Garzik
<jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:29 +0000
(
03:57
-0500)
committer
Jeff Garzik
<jgarzik@pobox.com>
Tue, 29 Nov 2005 08:57:29 +0000
(
03:57
-0500)
1
2
drivers/scsi/libata-core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/scsi/libata-core.c
Simple merge