From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Dec 2010 17:46:46 +0000 (-0800)
Subject: Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: upstream/snapshot3+hdmi~12233
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07058599b486fe342f371200ac4718fedbe9a354;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 's5p-fixes-for-linus' of git://git./linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV210: update MAX8998 platform data to get rid of WARN()
  ARM S3C24XX: Fix compilation of PM code for S3C2416
  ARM: S3C24XX: Fix CONFIG_S3C_DEV_NAND Kconfig entry
---

07058599b486fe342f371200ac4718fedbe9a354