summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-28 14:01:23 +0100
committerMark Brown <broonie@linaro.org>2014-06-28 14:01:23 +0100
commit7216a4183947853f359b41ba1edb5db9b3091acc (patch)
treee31b904fa7254b580bcd39e475aff4cdf5d49391 /drivers
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff)
parente61f487fd596ce570e87ccfdc0a7fc9fa87aced9 (diff)
parent4a8573abe965115bc5b064401fd669b74e985258 (diff)
parent25f8a7cc5856f1c697c9aee88b0a898fcb6d788c (diff)
Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/qup' and 'spi/fix/sh-sci' into spi-linus