lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
a7ce2e0d04
android_kernel_xiaomi_sm8350/drivers/scsi/ibmvscsi
History
Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree 
Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-22 00:36:56 -06:00
..
ibmvfc.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
ibmvfc.h [SCSI] ibmvfc: Reduce error recovery timeout 2010-05-02 11:03:22 -04:00
ibmvscsi.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
ibmvscsi.h [SCSI] ibmvscsi: Add suspend/resume support 2010-03-03 18:32:41 +05:30
ibmvstgt.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
iseries_vscsi.c [SCSI] ibmvscsi: Add suspend/resume support 2010-03-03 18:32:41 +05:30
Makefile
rpa_vscsi.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
viosrp.h