diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-28 18:57:38 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-28 18:57:38 (GMT) |
| commit | 68435fa1519cb92493fd59e05bc9dbe7f2205feb (patch) | |
| tree | c9f8c096f08608c1307e8ea59f061b265c6ebb66 /arch/arm/include/asm/arch-at91 | |
| parent | d5251742a7b2465c8de2841bc7db5a1e059c13a3 (diff) | |
| parent | 623e03256e222b42fb86fd81fafe508e3cb569a4 (diff) | |
| download | u-boot-fsl-qoriq-68435fa1519cb92493fd59e05bc9dbe7f2205feb.tar.xz | |
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 'arch/arm/include/asm/arch-at91')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91_common.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91cap9.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91cap9_matrix.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/clk.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/hardware.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_common.h b/arch/arm/include/asm/arch-at91/at91_common.h index 330edd8..8282f46 100644 --- a/arch/arm/include/asm/arch-at91/at91_common.h +++ b/arch/arm/include/asm/arch-at91/at91_common.h @@ -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> * * See file CREDITS for list of people who contributed to this diff --git a/arch/arm/include/asm/arch-at91/at91cap9.h b/arch/arm/include/asm/arch-at91/at91cap9.h index 5af6fdc..7bf363a 100644 --- a/arch/arm/include/asm/arch-at91/at91cap9.h +++ b/arch/arm/include/asm/arch-at91/at91cap9.h @@ -1,7 +1,7 @@ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91cap9.h] * - * Copyright (C) 2007 Stelian Pop <stelian.pop@leadtechdesign.com> + * Copyright (C) 2007 Stelian Pop <stelian@popies.net> * Copyright (C) 2007 Lead Tech Design <www.leadtechdesign.com> * Copyright (C) 2007 Atmel Corporation. * diff --git a/arch/arm/include/asm/arch-at91/at91cap9_matrix.h b/arch/arm/include/asm/arch-at91/at91cap9_matrix.h index 22b7e9b..a9b5ae0 100644 --- a/arch/arm/include/asm/arch-at91/at91cap9_matrix.h +++ b/arch/arm/include/asm/arch-at91/at91cap9_matrix.h @@ -1,7 +1,7 @@ /* * [origin: Linux kernel include/asm-arm/arch-at91/at91cap9_matrix.h] * - * Copyright (C) 2007 Stelian Pop <stelian.pop@leadtechdesign.com> + * Copyright (C) 2007 Stelian Pop <stelian@popies.net> * Copyright (C) 2007 Lead Tech Design <www.leadtechdesign.com> * Copyright (C) 2006 Atmel Corporation. * diff --git a/arch/arm/include/asm/arch-at91/clk.h b/arch/arm/include/asm/arch-at91/clk.h index f645327..1e8522b 100644 --- a/arch/arm/include/asm/arch-at91/clk.h +++ b/arch/arm/include/asm/arch-at91/clk.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2007 - * Stelian Pop <stelian.pop@leadtechdesign.com> + * Stelian Pop <stelian@popies.net> * Lead Tech Design <www.leadtechdesign.com> * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> * diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h index 36af571..85c2889 100644 --- a/arch/arm/include/asm/arch-at91/hardware.h +++ b/arch/arm/include/asm/arch-at91/hardware.h @@ -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> * * See file CREDITS for list of people who contributed to this |