diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 20:57:04 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 20:57:04 +0400 |
| commit | a49fe6d59aae7f7835288df508b709ed2d69cbab (patch) | |
| tree | 4d626942532a30a4fcf1ca26cc38f091de78c218 /init/main.c | |
| parent | 823e75f723aa3fefd5d2eecbf8636184ca4790fc (diff) | |
| parent | 9b28ee3c9122cea62f2db02f5bb1e1606bb343a6 (diff) | |
| download | linux-a49fe6d59aae7f7835288df508b709ed2d69cbab.tar.xz | |
Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions