Merge "HACK: exynos5: gscaler: do not skip s_fmt/reqbufs on gsc_convert path" into...
authorDima Zavin <dima@android.com>
Mon, 6 Aug 2012 23:12:09 +0000 (16:12 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 6 Aug 2012 23:12:10 +0000 (16:12 -0700)

Trivial merge