summaryrefslogtreecommitdiff
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2013-02-08 12:00:39 -0700
committerPaul Walmsley <paul@pwsan.com>2013-02-08 12:00:39 -0700
commitb5596a89412053aa0e18b59f40dc3a3e53917937 (patch)
tree13d2968424e2e36131ce114a1560d386f67085b3 /drivers/media/platform
parent88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7 (diff)
parentd0758237eeadde80ca36856345016bbc05b0e2b4 (diff)
parent6d1aa02f10497b138e01ebe6eafabd6071729334 (diff)
Merge branch 'clock_misc_devel_a_3.9', remote-tracking branch 'remotes/pinchart/omap3isp/clock' into clock_devel_a_3.9