summaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-27 15:05:12 -0500
committerTom Rini <trini@konsulko.com>2016-01-27 15:05:12 -0500
commit19bde0316f2c58b3ab6357832790aee6ed7a4ad5 (patch)
tree8216f416e21cf71745abaec2c5a42ab9824b290e /arch/powerpc/include
parentb20c38a973a51bf3f663bd298c63ad1b8e0de445 (diff)
parentf36919a8138ed7ecd3dbce4630e02936b13907da (diff)
downloadu-boot-imx-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.zip
u-boot-imx-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.tar.gz
u-boot-imx-19bde0316f2c58b3ab6357832790aee6ed7a4ad5.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/interrupt.h2
-rw-r--r--arch/powerpc/include/asm/xilinx_irq.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/interrupt.h b/arch/powerpc/include/asm/interrupt.h
index 1a6a933..9f370dd 100644
--- a/arch/powerpc/include/asm/interrupt.h
+++ b/arch/powerpc/include/asm/interrupt.h
@@ -1,6 +1,6 @@
/*
* (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
+ * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@gmail.com
* This work has been supported by: QTechnology http://qtec.com/
* Based on interrupts.c Wolfgang Denk-DENX Software Engineering-wd@denx.de
*
diff --git a/arch/powerpc/include/asm/xilinx_irq.h b/arch/powerpc/include/asm/xilinx_irq.h
index 333a037..5766bde 100644
--- a/arch/powerpc/include/asm/xilinx_irq.h
+++ b/arch/powerpc/include/asm/xilinx_irq.h
@@ -1,6 +1,6 @@
/*
* (C) Copyright 2008
- * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@uam.es
+ * Ricado Ribalda-Universidad Autonoma de Madrid-ricardo.ribalda@gmail.com
* This work has been supported by: QTechnology http://qtec.com/
* Based on interrupts.c Wolfgang Denk-DENX Software Engineering-wd@denx.de
* SPDX-License-Identifier: GPL-2.0+