summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-bcm2835aux.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-03-11 10:28:25 +0300
committerMark Brown <broonie@kernel.org>2016-03-11 10:28:25 +0300
commit6beb9fecbde45f09ea79a67ed5fd8d17e3bf6213 (patch)
tree1d794bc58b18229390631cdba50200132166fe5d /drivers/spi/spi-bcm2835aux.c
parentce7fb74f546cdd5a83fe9393263364f9d38cc96f (diff)
parenta0a90718f18264dc904d34a580f332006f5561e9 (diff)
parentb1353d1c1d4555b7c40066fa2cacc7da266e9904 (diff)
parent763dedfcda5f6c9294c4a5d048f5261f442cc1e8 (diff)
parente9dd4edcc98593bbcdffc0c4f37545b8fd0ad3ea (diff)
downloadlinux-6beb9fecbde45f09ea79a67ed5fd8d17e3bf6213.tar.xz
Merge remote-tracking branches 'spi/topic/acpi', 'spi/topic/axi-engine', 'spi/topic/bcm2835' and 'spi/topic/bcm2835aux' into spi-next