Merge branch 'next/cleanup-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:41:38 +0000 (22:41 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 21:41:38 +0000 (22:41 +0100)
 From Kukjin Kim <kgene.kim@samsung.com>:

Two small cleanups for the s5p platforms.
* 'next/cleanup-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S5PV210: remove useless ifdef in common.h
  ARM: S5PC100: remove useless ifdef in common.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge