Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar

Browse source

Conflicts (removal of an error handling fix due to devm conversion):
	drivers/spi/spi-rspi.c

...

This commit is contained in:

Mark Brown 2013-11-27 16:37:21 +00:00

parent 5d79e9ac89 53063ec6e2

commit 85cfe6b64d

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 is not available