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

Browse Source

Conflicts:
	drivers/spi/spi-bcm2835.c

...

This commit is contained in:

Mark Brown

2015-04-27 19:47:37 +01:00

parent a750b124cf 145367baa4

commit 5d0fe6362e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available