Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc

Browse source

Conflicts:
	drivers/spi/spi-s3c64xx.c

...

This commit is contained in:

Grant Likely 2012-01-30 08:32:37 -07:00

parent dcd6c92267 b97b662174

commit bc26618588

1 changed files with 103 additions and 11 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

114

drivers/spi/spi-s3c64xx.c

View file