Merge tag 's3c24xx-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:18:40 +0000 (22:18 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 20:18:40 +0000 (22:18 +0200)
commit62274f8f938be0e99f4a2ce1a9917638e0fe8fa2
treed5cac78f2528e9747a647844b62ee9913c98695e
parent6f9543f158a1068a69cf8ed0ef423f96f38205e0
parent52c76e44f1b8e63474b9ef5455f657c13e983e95
Merge tag 's3c24xx-dt-2' of git://git./linux/kernel/git/kgene/linux-samsung into next/dt

From Kukjin Kim:

based on tags/s3c24xx-dt-1
- update uart addresses in s3c2416-dt auxdata due to removing S3C2410_PA_UARTX

* tag 's3c24xx-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: update uart addresses in s3c2416-dt auxdata

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