Olof Johansson 823c9faefc Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc ... From Kukjin Kim: Just adding camif gpio setup and clkdev. * 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: Add clkdev entry for camif-upll clock ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers + Linux 3.7-rc6 Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c include/linux/clk-provider.h, resolved as in other branches. Signed-off-by: Olof Johansson <olof@lixom.net>		2012-11-30 09:27:57 -08:00
..
clk-prcc.c
clk-prcmu.c	clk: ux500: Support prcmu ape opp voltage clock	2012-10-29 11:05:53 -07:00
clk.h	clk: ux500: Support prcmu ape opp voltage clock	2012-10-29 11:05:53 -07:00
Makefile	clk: ux500: First version of clock definitions for ux500	2012-09-06 15:58:04 -07:00
u8500_clk.c	Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc	2012-11-30 09:27:57 -08:00
u8540_clk.c	clk: ux500: First version of clock definitions for ux500	2012-09-06 15:58:04 -07:00
u9540_clk.c	clk: ux500: First version of clock definitions for ux500	2012-09-06 15:58:04 -07:00