diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-10 19:55:44 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-05-10 20:24:14 +0300 |
| commit | 9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262 (patch) | |
| tree | d034047d7cd562700c59a0b1b3ba707367939fe7 /drivers/spi/spi-omap2-mcspi.c | |
| parent | Merge branch 'archit/set-timing-work' (diff) | |
| parent | OMAPDSS: DSI: implement generic DSI pin config (diff) | |
| download | wireguard-linux-9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262.tar.xz wireguard-linux-9b71fb5cbcdd83c65e5fe6db9cd12246f7ea0262.zip | |
Merge branch 'for-l-o-3.5'
Conflicts:
drivers/video/omap2/displays/panel-taal.c
Merge OMAP DSS related board file changes. The branch will also be
merged through linux-omap tree to solve conflicts.
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
0 files changed, 0 insertions, 0 deletions