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)
commit3e9caa525147e28d032a8e413d9797c21cbaf88c
treeae92a81d643f8116ad23b9ea09f8fb8a7dd1a933
parent59b30294e14fa6a370fdd2bc2921cca1f977ef16
parent03652e0ad4b140523ec5ef7fec8d2b3c7218447b
Merge branch 'v4l_for_linus' into staging/for_v3.4

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