diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 12:20:31 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-03-06 12:20:31 +0100 |
| commit | 0ba86d7edea1f9f2d9497c31200910263e8b4128 (patch) | |
| tree | 387f713e1afdd181e92699dcaa5fa3d45b30c75b /drivers/scsi/arm | |
| parent | Merge branch 'work/old-omapfb-removal' (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | linux-0ba86d7edea1f9f2d9497c31200910263e8b4128.tar.xz linux-0ba86d7edea1f9f2d9497c31200910263e8b4128.zip | |
Merge commit 'v3.3-rc6'
Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
Conflicts:
arch/arm/mach-omap1/board-innovator.c
drivers/video/omap2/dss/apply.c
Diffstat (limited to 'drivers/scsi/arm')
0 files changed, 0 insertions, 0 deletions