diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-28 19:57:38 +0100 |
| commit | 68435fa1519cb92493fd59e05bc9dbe7f2205feb (patch) | |
| tree | c9f8c096f08608c1307e8ea59f061b265c6ebb66 /drivers | |
| parent | d5251742a7b2465c8de2841bc7db5a1e059c13a3 (diff) | |
| parent | 623e03256e222b42fb86fd81fafe508e3cb569a4 (diff) | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
MAKEALL: drop obsolete mx31pdk_nand target
dataflash: fix parameters order in write_dataflash()
hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
arm: a320evb: define mach-type in board config file
OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
Fix Stelian's email address
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 818d3624a7..de663824fe 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2007-2008 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * * (C) Copyright 2006 ATMEL Rousset, Lacressonniere Nicolas |