projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31ce6da c2a6585)
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)
1  2 
drivers/scsi/libata-core.c patch | diff1 | diff2 | blob | history
include/linux/libata.h patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/libata-core.c
Simple merge
diff --cc include/linux/libata.h
Simple merge
John Crispins staging tree