aboutsummaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorMark Brown2017-06-13 18:51:05 +0100
committerMark Brown2017-06-13 18:51:05 +0100
commitc94085f587a77495eabb78a959bd591bee4ec89b (patch)
treef23a97a1cd1eb275bc34a78d3c96d86c9322951c /net/wireless
parentad25c92ecb160235668cdeaff26f5907a6fbf6b3 (diff)
parentce70e06c093a9609377e93ee20e7c528e156af14 (diff)
parentb56ffae8998f7c3fc892f11b32b4dd1975efd993 (diff)
Merge branches 'topic/core', 'topic/slave' and 'fix/doc' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-master