diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 13:40:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-31 13:40:29 -0700 |
| commit | 57eb06e584be3b702d1ba5c39e0b57ddcdabdc66 (patch) | |
| tree | 2b438f438748ff0c9dec86ee44cfb615f7ccee46 /include/asm-arm/arch-pxa/mfp.h | |
| parent | 2ed45b07c957e37db88d7d3696b63eb79b0ef5ef (diff) | |
| parent | 558de8a74efe37a4b5e2ef944da17d23e701dd98 (diff) | |
| download | linux-3.10-57eb06e584be3b702d1ba5c39e0b57ddcdabdc66.tar.gz linux-3.10-57eb06e584be3b702d1ba5c39e0b57ddcdabdc66.tar.bz2 linux-3.10-57eb06e584be3b702d1ba5c39e0b57ddcdabdc66.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4634/1: DaVinci GPIO header build fix
[ARM] 4636/1: pxa: add default configuration for zylonite
[ARM] 4635/1: pxa: Change Eric Miao's email address to eric.miao@marvell.com
[ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c
[ARM] nommu: fix breakage caused by f9720205d1f847cb59e197e851b5276425363f6b
[ARM] pxa: shut up CLOCK_EVT_MODE_RESUME warning
[ARM] Fix FIQ issue with ARM926
[ARM] Fix pxamci regression
[ARM] Fix netx_defconfig regression
[ARM] Fix ateb9200_defconfig build regression
[ARM] Fix an rpc_defconfig regression
[ARM] Fix omap_h2_1610_defconfig regressions
[ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h
Diffstat (limited to 'include/asm-arm/arch-pxa/mfp.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/mfp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/mfp.h b/include/asm-arm/arch-pxa/mfp.h index 60291742ffd..ac4157af5a8 100644 --- a/include/asm-arm/arch-pxa/mfp.h +++ b/include/asm-arm/arch-pxa/mfp.h @@ -5,7 +5,7 @@ * * Copyright (C) 2007 Marvell International Ltd. * - * 2007-8-21: eric miao <eric.y.miao@gmail.com> + * 2007-8-21: eric miao <eric.miao@marvell.com> * initial version * * This program is free software; you can redistribute it and/or modify |