Merge branch 'v4l_for_linus' into staging/for_v3.4
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 23 Jan 2012 20:13:33 +0000 (18:13 -0200)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 23 Jan 2012 20:13:33 +0000 (18:13 -0200)
* v4l_for_linus:
  [media] V4L: atmel-isi: add clk_prepare()/clk_unprepare() functions


Trivial merge