summaryrefslogtreecommitdiff
path: root/drivers/nvdimm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-02 15:56:34 +0100
committerMark Brown <broonie@kernel.org>2018-04-02 15:56:34 +0100
commit70a3550b8c8b8937d0235fa669e4f6d2dd78fdf6 (patch)
tree275044784e08d8f1911dd3453a9ed3b7219027ae /drivers/nvdimm
parentb3181e294959abb8ebd075a13515aefdbc7f68d1 (diff)
parent357325764d7eabc4d2169d26af079b441fd48bc5 (diff)
parentbc3cc75281b3c2b1c5355d88d147b66a753bb9a5 (diff)
parentd704afffe65c8fab424963c1ba4ec4364c2d6a82 (diff)
parent721483e28889431426a15fe906f48aacd17f0999 (diff)
parent77a060533c0468069d0b4a5d1968a42259763f08 (diff)
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm-qspi', 'spi/topic/bcm2835aux', 'spi/topic/dw' and 'spi/topic/gpio' into spi-next