]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ee7895 5ecee0a)
Merge branch 'fixes' into misc
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 15 Mar 2016 22:24:44 +0000 (15:24 -0700)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Tue, 15 Mar 2016 22:24:44 +0000 (15:24 -0700)
1  2 
drivers/scsi/be2iscsi/be_main.c patch | diff1 | diff2 | blob | history
drivers/scsi/scsi_lib.c patch | diff1 | diff2 | blob | history

diff --cc drivers/scsi/be2iscsi/be_main.c
Simple merge
diff --cc drivers/scsi/scsi_lib.c
Simple merge
XArray, radix tree and IDR