]> Pileus Git - ~andy/linux/commit
Merge branch 'work/fifomerge'
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 25 Jan 2012 11:50:34 +0000 (13:50 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 25 Jan 2012 11:50:34 +0000 (13:50 +0200)
commit5e36097889725dbe4f098c3f1e93cb2f21cae6ee
tree11955ac488b6229d115b8aad63ede0946ee6d79b
parent6e2a14d2c59f6208310eeb6b031e9d1c22b38c6a
parente0e405b9252e5e8926786d796e0d4293bc90cd56
Merge branch 'work/fifomerge'
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/dsi.c