From: Olof Johansson <olof@lixom.net>
Date: Fri, 30 Nov 2012 17:25:16 +0000 (-0800)
Subject: Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~49^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=823c9faefc5534273aceaca12d845dbc11782a6d;p=pandora-kernel.git

Merge branch 'next/cam-samsung' of git://git./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>
---

823c9faefc5534273aceaca12d845dbc11782a6d
Reading git-diff-tree failed