diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 09:04:03 (GMT) |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 09:04:03 (GMT) |
| commit | bc3b67b8e965c1b499d604b7ec7d2e6090570c13 (patch) | |
| tree | ea89cc298093c96162c76deccf424a4dc16d0842 /arch/arm/mach-s3c2440/mach-rx3715.c | |
| parent | b78232da3f85950a207bbcb64db46fd95b581465 (diff) | |
| parent | 26be1b7b317f1d6e9226ba3f450476b0a6d423a3 (diff) | |
| download | linux-bc3b67b8e965c1b499d604b7ec7d2e6090570c13.tar.xz | |
ARM: Merge for-2635/s3c24xx-general
Merge branch 'for-2635/s3c24xx-general' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-rx3715.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index 1e836e5..d2946de 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c @@ -209,7 +209,7 @@ static void __init rx3715_init_machine(void) } MACHINE_START(RX3715, "IPAQ-RX3715") - /* Maintainer: Ben Dooks <ben@fluff.org> */ + /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ .phys_io = S3C2410_PA_UART, .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, .boot_params = S3C2410_SDRAM_PA + 0x100, |