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
..
core.h	Merge tag 'highbank-debugll-cleanup' of git://sources.calxeda.com/kernel/linux into next/soc	2012-11-21 02:13:12 -08:00
highbank.c	ARM: highbank: use common debug_ll_io_init	2012-11-07 18:00:24 -06:00
hotplug.c	ARM: highbank: abstract out SCU usage	2012-10-31 13:46:50 -05:00
Kconfig	ARM: highbank: Add initial ECX-2000 support	2012-10-31 13:47:01 -05:00
Makefile	ARM: highbank: use common debug_ll_io_init	2012-11-07 18:00:24 -06:00
platsmp.c	ARM: highbank: abstract out SCU usage	2012-10-31 13:46:50 -05:00
pm.c	ARM: highbank: abstract out SCU usage	2012-10-31 13:46:50 -05:00
smc.S	ARM: highbank: Add smc calls to enable/disable the L2	2012-06-07 22:39:43 -07:00
sysregs.h	ARM: highbank: abstract out SCU usage	2012-10-31 13:46:50 -05:00
system.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