summaryrefslogtreecommitdiffstats
path: root/include/scsi/scsi.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-10-23 11:46:30 +0200
committerMark Brown <broonie@kernel.org>2017-10-23 11:46:30 +0200
commit2ab19d521ebe900f42be1d41333a8e66974dcc7e (patch)
tree8a4643032b0723e921592afd0709b2c694cd8265 /include/scsi/scsi.h
parent33d930e59a98fa10a0db9f56c7fa2f21a4aef9b9 (diff)
parent986e7b7e4991a5d3abab26f97a671512e09e4417 (diff)
parentd824c7a8e88a7162d14782e73a6a6c867a266500 (diff)
downloadlinux-2ab19d521ebe900f42be1d41333a8e66974dcc7e.tar.bz2
Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/rn5t618' into regulator-linus