Commit 5d0fe636 authored by Mark Brown's avatar Mark Brown

Merge branch 'fix/bcm2835-code' of...

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

Conflicts:
	drivers/spi/spi-bcm2835.c
parents a750b124 145367ba
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment