Merge tag 'v3.7-rc1'
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 16 Oct 2012 10:30:09 +0000 (13:30 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 16 Oct 2012 10:30:09 +0000 (13:30 +0300)
Merge Linux 3.7-rc1 to get latest upstream changes.

1  2 
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dsi.c

Simple merge
Simple merge