git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
mach-jive.c
diff --git
a/arch/arm/mach-s3c2412/mach-jive.c
b/arch/arm/mach-s3c2412/mach-jive.c
index
4316018
..
478f4b4
100644
(file)
--- a/
arch/arm/mach-s3c2412/mach-jive.c
+++ b/
arch/arm/mach-s3c2412/mach-jive.c
@@
-674,7
+674,7
@@
static void __init jive_machine_init(void)
}
MACHINE_START(JIVE, "JIVE")
}
MACHINE_START(JIVE, "JIVE")
- /* 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,
.phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,