summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-omap-uwire.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-30 00:51:27 +0000
committerMark Brown <broonie@linaro.org>2014-03-30 00:51:27 +0000
commit17523680647be26cf792e58f6e8cccb0fd010fd4 (patch)
tree8c885008a6d8036daf1f746b055e0bddbc5c8d71 /drivers/spi/spi-omap-uwire.c
parent6e07b9179aa0f85d16b95a7d5d2a48c7a145291a (diff)
parentcbab80464f7470432b4b8061333c572a8b9a713f (diff)
parentd1c18caace25aa8b6fcfe4dc78e96a031f1eab2d (diff)
parentaca0924b4819e813bdae2c595bf736ec2b593585 (diff)
parentcd2ac0c0cdc5b255489a2cfd388b2d3eda37e7a7 (diff)
parent84a5dc41f64faadb79cde600b130c8cbd7e21977 (diff)
parent00cce74d081e86ee0660cbe41699cbc523a55605 (diff)
parent490c97747d5dc77dfb5826e2823b41d8b2ef7ecc (diff)
parent380603712072145785f19040b9791f4f6cde414e (diff)
Merge remote-tracking branches 'spi/topic/omap-uwire', 'spi/topic/omap100k', 'spi/topic/omap2', 'spi/topic/orion', 'spi/topic/pl022', 'spi/topic/qup', 'spi/topic/rspi' and 'spi/topic/s3c24xx' into spi-next