Merge branch 'v4l_for_linus' into staging/for_v3.4

* v4l_for_linus:
  [media] V4L: atmel-isi: add clk_prepare()/clk_unprepare() functions
This commit is contained in:
Mauro Carvalho Chehab 2012-01-23 18:13:33 -02:00
commit 3e9caa5251