]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
commita3fe14c69049750b7540c66e2a4abceb03815f65
tree62dc31c2ba03ec23401281f9483152010f493827
parent3cdb59d73ec63b42c49e43914c7de550d606159f
parenteb50cd0b2a083950457bf68241a9f040972b6908
Merge branch 'next/cleanup-s5p' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

 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>