summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 00:51:03 +0000
committerMark Brown <broonie@linaro.org>2014-03-30 00:51:03 +0000
commit9dee279b400629100dce152e40e058ae46046922 (patch)
treec3994877974b117d444d6da9b2e5d39a806f9b7c /drivers/spi/spi-imx.c
parent0f38af451fc494378110d702058acf59d24b5331 (diff)
parent78e39523b8c9721250b54b7fd930aeced56cf511 (diff)
parent354312f16e49add1da78f0cfb2bcb633709d0071 (diff)
parent6f50c6bc61d4f8cac9dfa21d2db3917deb9beb20 (diff)
parent8023d384ff5c55a431c1a9a84cd76648d43ba7d8 (diff)
parentaa0fe82629f19efba5c870bc9be089a4f8056a75 (diff)
parentb53b34f042fe17df21a431abc76896a72dbc5670 (diff)
Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/completion' and 'spi/topic/davinci' into spi-next