From: Mark Brown <broonie@kernel.org>
Date: Mon, 27 Apr 2015 18:47:37 +0000 (+0100)
Subject: Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.2-rc1~142^2~5^2~4
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc

Merge branch 'fix/bcm2835-code' of git://git./linux/kernel/git/broonie/spi into spi-bcm2835

Conflicts:
	drivers/spi/spi-bcm2835.c
---

5d0fe6362e7d416002ea4ee61bfe3ae6f505e9cc