summaryrefslogtreecommitdiffstats
path: root/drivers/block/nvme-scsi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-02-12 11:47:33 +0000
committerMark Brown <broonie@linaro.org>2014-02-12 11:47:33 +0000
commit5c306c8ab5dac69714f6e38bed95cfb6bd7758ed (patch)
tree9b955b4a868a9155764579fbf9b02aace3e66733 /drivers/block/nvme-scsi.c
parentb28a960c42fcd9cfc987441fa6d1c1a471f0f9ed (diff)
parentf17083c3affccfe955b0a419056784096c18fea8 (diff)
parent667a6b7a620ec6e0c1e6689b8c6531c51ce6cdfa (diff)
downloadop-kernel-dev-5c306c8ab5dac69714f6e38bed95cfb6bd7758ed.zip
op-kernel-dev-5c306c8ab5dac69714f6e38bed95cfb6bd7758ed.tar.gz
Merge remote-tracking branches 'regulator/fix/da9055' and 'regulator/fix/max14577' into regulator-linus
OpenPOWER on IntegriCloud