summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/rcar/rcar_can.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-12-20 16:01:30 +0000
committerMark Brown <broonie@kernel.org>2018-12-20 16:01:30 +0000
commit74ff666bd7ba2da563f99f2a8af7bf9f20008bc9 (patch)
tree09b815bf09932e583082a633c874f091791d6838 /drivers/net/can/rcar/rcar_can.c
parentb3fc4e0e966eaaf2f8afa1de3280770acd838b87 (diff)
parentaa167f3fed0c37e0e4c707d4331d827661f46644 (diff)
parent2a9d92fb3a1282a4659f1bb6d5684018846537b7 (diff)
downloadlinux-74ff666bd7ba2da563f99f2a8af7bf9f20008bc9.tar.gz
linux-74ff666bd7ba2da563f99f2a8af7bf9f20008bc9.tar.bz2
linux-74ff666bd7ba2da563f99f2a8af7bf9f20008bc9.zip
Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next