diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-05-08 00:32:35 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-05-08 00:32:35 +0200 |
| commit | 3c4bd60de15d79ddfc0cf3170a55847b2025d93f (patch) | |
| tree | 891b84b58f13a5f45536a243585b9d94c253a410 /include/asm-blackfin/traps.h | |
| parent | fb05f6da35ea1c15c553abe6f23f656bf18dc5db (diff) | |
| parent | ac4cd59d59c9bf3f89cb7a344abf8184d678f562 (diff) | |
| download | u-boot-imx-3c4bd60de15d79ddfc0cf3170a55847b2025d93f.zip u-boot-imx-3c4bd60de15d79ddfc0cf3170a55847b2025d93f.tar.gz u-boot-imx-3c4bd60de15d79ddfc0cf3170a55847b2025d93f.tar.bz2 | |
Merge git://www.denx.de/git/u-boot
Conflicts:
include/asm-microblaze/microblaze_intc.h
include/linux/stat.h
Diffstat (limited to 'include/asm-blackfin/traps.h')
| -rw-r--r-- | include/asm-blackfin/traps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-blackfin/traps.h b/include/asm-blackfin/traps.h index 29e6eba..b90ceda 100644 --- a/include/asm-blackfin/traps.h +++ b/include/asm-blackfin/traps.h @@ -1,7 +1,7 @@ /* * U-boot - traps.h * - * Copyright (c) 2005 blackfin.uclinux.org + * Copyright (c) 2005-2007 Analog Devices Inc. * * This file is based on * linux/include/asm/traps.h @@ -23,8 +23,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA */ /* |