diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-23 13:07:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-23 13:07:14 +0000 |
| commit | 8aeab58e560da02772d6018eb4d6923514476a04 (patch) | |
| tree | 645bef7e7e575cd57cc6eaf0406adced71fb3759 /kernel/trace/trace_event_perf.c | |
| parent | 907e26b6f52004ecec152f5650b5dc687aed7157 (diff) | |
| parent | 382cebb02a68764a51a412b8affccd325059d0a5 (diff) | |
| parent | 5a33d30ff1b8fdfb5bd8f4fa46dd473bf768aeff (diff) | |
| parent | 85a9012446d4b59a57c5942ca059144fdf8cd439 (diff) | |
| parent | 3e83c1949790d542435866651f451ddecc30ad41 (diff) | |
| parent | 909e709c77df739ccba610dc48a301fd9ee8249c (diff) | |
| parent | 48c3fc93803a27bb9d2c79d718cf142974f080c8 (diff) | |
| parent | a553a31d9f32700ef0d3a1490e222ec15e600140 (diff) | |
| parent | 5fd38677a48deab4ea480f078a838758a030d3a2 (diff) | |
| parent | bdf0290ac70f5a09e85507bf6c84dc6a399dff82 (diff) | |
| parent | 4cc16085c80d3363315ad183ad72654993766a0f (diff) | |
Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qspi', 'spi/topic/s3c24xx', 'spi/topic/s3c64xx', 'spi/topic/sh', 'spi/topic/tegra114', 'spi/topic/tegra20-sflash', 'spi/topic/tegra20-slink', 'spi/topic/txx9' and 'spi/topic/xcomm' into spi-linus