summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-rockchip.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-07-25 00:08:25 +0300
committerMark Brown <broonie@kernel.org>2016-07-25 00:08:25 +0300
commit9a4506b60ddeaac69006a0b2df8354fb97277a24 (patch)
treecebdf57bcdee5c42760fc017759ff9945e8cc57c /drivers/spi/spi-rockchip.c
parentac3e62b8208b655bfee8d33c38664c5ca1ff8a61 (diff)
parentca80ef718b12eebe247b776d4b97a5e571bb489d (diff)
parentaa29ea3df27dbba19ef59023d0f7330f2fdc58ae (diff)
parent0dbe70a1feb411d17fbcf8e73d61e6c7f33fda72 (diff)
parent38e099208c80b2617015385fe821b68a64757008 (diff)
parenta6802cc05f9e48e86bc3f9f056c74a69dc5e37fa (diff)
downloadlinux-9a4506b60ddeaac69006a0b2df8354fb97277a24.tar.xz
Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/rockchip', 'spi/topic/s3c64xx', 'spi/topic/sh' and 'spi/topic/sh-msiof' into spi-next