diff options
| author | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:12 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-11-04 11:02:12 +0000 |
| commit | 4c84518523f888994c618585021c76fa499d465e (patch) | |
| tree | 448a04c4507edb0e892a178b5e2a59c87044996c /drivers/mfd/ezx-pcap.c | |
| parent | fc579056af0bdaf9944e2c023c06ae9251cde3c0 (diff) | |
| parent | 76f67ea9bf27b045eacf8f1e148fd13149f51823 (diff) | |
| parent | 160f8d0691659b65a97494c151c95b1287c377ae (diff) | |
| parent | 3821a065f5672c430a088ae68b4da2a2d2b34106 (diff) | |
| parent | 54bf4505bd64bdb61e343fc007f2f21899172931 (diff) | |
| parent | 0db642151ad80967e9e1c2abf3e19bd7902ecdc9 (diff) | |
Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi/topic/owner', 'spi/topic/pxa' and 'spi/topic/pxa2xx' into spi-next