]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1541d5 3237ee7)
merge by hand (qla_os.c mismerge)
authorJames Bottomley <jejb@titanic.(none)>
Sat, 18 Jun 2005 00:04:18 +0000 (19:04 -0500)
committerJames Bottomley <jejb@titanic.(none)>
Sat, 18 Jun 2005 00:04:18 +0000 (19:04 -0500)
1  2 
drivers/scsi/qla2xxx/qla_os.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge
Linux 2.6 source tree