Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof

Browse source

Conflicts:
	drivers/spi/spi-sh-msiof.c

...

This commit is contained in:

Mark Brown 2015-01-06 11:06:46 +00:00

parent 3110628d89 6d40530e47

commit 6b038c8d2b

1 changed files with 1 additions and 1 deletions

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

2

drivers/spi/spi-sh-msiof.c

View file