tree b81c80b8a45df06eae4293f20f39625f8d6ad1e6
parent 70231669596fdd76dddfc2a4f53415d3dd84377e
parent 754961a8e1ef49ee2d304d2ab086cf0aa6809214
author Linus Torvalds <torvalds@linux-foundation.org> 1289839384 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289839384 -0800

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/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