Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux… · mariux64/linux@5d0fe63 · GitHub

Commit

Merge branch 'fix/bcm2835-code' of git://git.kernel.org/pub/scm/linux…

Browse files

…/kernel/git/broonie/spi into spi-bcm2835

Conflicts:
	drivers/spi/spi-bcm2835.c

Loading branch information

Mark Brown committed Apr 27, 2015

2 parents a750b12 + 145367b commit 5d0fe63