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
..
irq-bcm2835.c	irqchip: irq-bcm2835: Add terminating entry for of_device_id table	2012-11-06 07:37:10 -08:00
irq-sunxi.c	irqchip: sunxi: Add irq controller driver	2012-11-16 21:56:51 +01:00
irq-versatile-fpga.c	ARM: plat-versatile: move FPGA irq driver to drivers/irqchip	2012-11-04 18:09:12 +01:00
Kconfig	ARM: plat-versatile: move FPGA irq driver to drivers/irqchip	2012-11-04 18:09:12 +01:00
Makefile	Allwinner SoC support for 3.8	2012-11-20 22:14:59 -08:00