Merge branch 'fix/img-spfi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:04:43 +0000 (21:04 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:04:43 +0000 (21:04 +0100)
1  2 
drivers/spi/spi-img-spfi.c

Simple merge