diff options
author | Mark Brown <broonie@kernel.org> | 2015-10-24 01:28:29 +0900 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-24 01:28:29 +0900 |
commit | 0dc9631221c95cc5ba31c115bf21c9b156aab253 (patch) | |
tree | cae2a3b6660f4491bec2aed189f9be40c10809fc /drivers | |
parent | 7379047d5585187d1288486d4627873170d0005a (diff) | |
parent | 243f07be2423efe0b17e8ffafc9a36dad50406d3 (diff) | |
parent | 6b7bc0618ff1a333d2265131b124e966335d5dee (diff) | |
download | linux-0dc9631221c95cc5ba31c115bf21c9b156aab253.tar.bz2 |
Merge branches 'topic/core' and 'topic/stats' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-doc