Merge remote-tracking branches 'spi/fix/img-spfi' and 'spi/fix/msiof' into spi-linus
authorMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:57:54 +0000 (12:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 24 Dec 2014 12:57:54 +0000 (12:57 +0000)
commitee4629f5b2f3dda7c83fa816068a67073abb55d9
tree341e0c232286acc9d10743bb3ee5da32ef3d6e59
parent76fe5e95fac3c93bdff9102480e5ba823ba656c3
parent015760563ec77bf17cec712fa94afdf53b285287
Merge remote-tracking branches 'spi/fix/img-spfi' and 'spi/fix/msiof' into spi-linus
drivers/spi/spi-sh-msiof.c