From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Mon, 23 Jan 2012 20:13:33 +0000 (-0200)
Subject: Merge branch 'v4l_for_linus' into staging/for_v3.4
X-Git-Tag: v3.4-rc1~110^2^2~254
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=3e9caa525147e28d032a8e413d9797c21cbaf88c;p=linux.git

Merge branch 'v4l_for_linus' into staging/for_v3.4

* v4l_for_linus:
  [media] V4L: atmel-isi: add clk_prepare()/clk_unprepare() functions
---

3e9caa525147e28d032a8e413d9797c21cbaf88c