Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@kernel.org>
Mon, 27 Apr 2015 18:47:37 +0000 (19:47 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 27 Apr 2015 18:47:37 +0000 (19:47 +0100)
Conflicts:
drivers/spi/spi-bcm2835.c


Trivial merge