projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e86ee66 3fd07d3)
Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Fri, 23 Sep 2005 23:03:21 +0000 (19:03 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 23 Sep 2005 23:03:21 +0000 (19:03 -0400)
1  2 
drivers/scsi/libata-core.c patch | diff1 | diff2 | blob | history
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

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