summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-31 14:45:29 +0100
committerMark Brown <broonie@kernel.org>2015-08-31 14:45:29 +0100
commit9d05943e79cc54a9d8ef8196900d7cca9e5ca039 (patch)
tree4aefee163aca7b68329eae4262c1e56b4f6fe4c5 /include/linux
parent8e42ac814c63dd5c5e39bbbfbc9c6578e19c765f (diff)
parentbdbbd38106c9f72c569be18314f68387e384536c (diff)
parentca861dd0c5e36c4a2cf454049a45a961c855290a (diff)
parentf4d86223771533c68f1a6692d499f7ef0025f733 (diff)
parent1b0838b5a794456ca36ce02b405bd7bcc85bfba0 (diff)
Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2835', 'spi/topic/bcm63xx-hsspi' and 'spi/topic/davinci' into spi-next