Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 May 2013 16:57:04 +0000 (09:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 May 2013 16:57:04 +0000 (09:57 -0700)
Pull omap3isp clk support from Mauro Carvalho Chehab:
 "This patch were sent in separate as it depends on a merge from clock
  framework, that you merged in commit 362ed48dee50"

* 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] omap3isp: Use the common clock framework


Trivial merge