Commit 4f1e725b authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge remote-tracking branch 'scsi/for-next' 

# Conflicts:
#	drivers/scsi/scsi_sysfs.c
parents 98ea696a 42201294
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment