From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Nov 2010 16:43:04 +0000 (-0800)
Subject: Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: submit/tizen/20141203.153721~9597
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f187a4514f54382ab017e8630d7d1f51732dabd8;p=platform%2Fkernel%2Flinux-arm64.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: SAMSUNG: Fix HAVE_S3C_RTC warnings
  ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warnings
  ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings
---

f187a4514f54382ab017e8630d7d1f51732dabd8