aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown2015-04-11 23:09:18 +0100
committerMark Brown2015-04-11 23:09:18 +0100
commit8afba181b90fbad372c420c302a57c0c4f9fdae4 (patch)
treecdbefe0c6f868baf7e78ace54598d6b6411eff30 /include
parent35fbf8452ce6e7da4389d037a981c9d8d58dc1b7 (diff)
parentdb91841b58f9ad0ecbb81ed0fa496c3a1b67fd63 (diff)
parentd4f9dcd1ac94e61e097951fd3dfb1cdf000a2660 (diff)
parent7183d1ebda477c48e5f51f854a766c96b6c0e142 (diff)
parentea022bbb0090975a21c581d8405fbe90043a6eda (diff)
parenteecacf73a40f37e74dc9d0453283c79b91f34d51 (diff)
Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi/topic/pl022', 'spi/topic/pm' and 'spi/topic/pxa2xx' into spi-next