Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x

Browse source

Conflicts:
	drivers/spi/spi-clps711x.c

...

This commit is contained in:

Mark Brown 2013-10-03 17:25:40 +01:00

parent c70837908d 0158026ccc

commit 2b2322d662

1 changed files with 0 additions and 3 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

3

drivers/spi/spi-clps711x.c

View file