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)
commita49fe6d59aae7f7835288df508b709ed2d69cbab
tree4d626942532a30a4fcf1ca26cc38f091de78c218
parent823e75f723aa3fefd5d2eecbf8636184ca4790fc
parent9b28ee3c9122cea62f2db02f5bb1e1606bb343a6
Merge branch 'topic/omap3isp' of git://git./linux/kernel/git/mchehab/linux-media

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