Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Nov 2010 16:43:04 +0000 (08:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Nov 2010 16:43:04 +0000 (08:43 -0800)
* '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

1  2 
arch/arm/Kconfig

Simple merge