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)
commit5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc
tree79be85d4598b85cc2f9ba5700dac7bd04d4083b7
parenta750b124cfd27bae1a12df22318db5a2083dfb12
parent145367baa492246cc19d7e859db642e6fed6908e
Merge branch 'fix/bcm2835-code' of git://git./linux/kernel/git/broonie/spi into spi-bcm2835

Conflicts:
drivers/spi/spi-bcm2835.c