tree 5db2ee161f892c5f5523d8a10c596fe4e6b96317
parent 5b7897db00bd66a42c626012f51cd3b1d5e6bee5
parent 7d3b5fac45a5d41cbc6bea9f67bd07a0c50bd118
author Olof Johansson <olof@lixom.net> 1354296316 -0800
committer Olof Johansson <olof@lixom.net> 1354296477 -0800

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>