Merge tag 'v4.0-rc7' into spi-img-spfi
authorMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:04:25 +0000 (21:04 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:04:25 +0000 (21:04 +0100)
Linux 4.0-rc7

1  2 
drivers/spi/spi-img-spfi.c

Simple merge