diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/clk.h | 1 | ||||
| -rw-r--r-- | doc/git-mailrc | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -38,7 +38,8 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com> Christian Kohn <chris.kohn@amd.com> <christian.kohn@xilinx.com> Dirk Behme <dirk.behme@googlemail.com> Durga Challa <durga.challa@amd.com> <vnsl.durga.challa@xilinx.com> -Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com> +Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com> +Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com> Fabio Estevam <fabio.estevam@nxp.com> Harini Katakam <harini.katakam@amd.com> <harini.katakam@xilinx.com> Harsha <harsha.harsha@amd.com> <harsha.harsha@xilinx.com> diff --git a/arch/arm/mach-at91/include/mach/clk.h b/arch/arm/mach-at91/include/mach/clk.h index c1d92739e47..09b8f0586c6 100644 --- a/arch/arm/mach-at91/include/mach/clk.h +++ b/arch/arm/mach-at91/include/mach/clk.h @@ -11,6 +11,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/at91_pmc.h> #include <asm/global_data.h> +#include <asm/io.h> #define GCK_CSS_SLOW_CLK 0 #define GCK_CSS_MAIN_CLK 1 diff --git a/doc/git-mailrc b/doc/git-mailrc index ca2f67a3b6e..1177e42df2f 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -22,7 +22,7 @@ alias apritzel Andre Przywara <andre.przywara@arm.com> alias bmeng Bin Meng <bmeng.cn@gmail.com> alias danielschwierzeck Daniel Schwierzeck <daniel.schwierzeck@gmail.com> alias dinh Dinh Nguyen <dinguyen@kernel.org> -alias ehristev Eugen Hristev <eugen.hristev@collabora.com> +alias ehristev Eugen Hristev <eugen.hristev@linaro.org> alias hs Heiko Schocher <hs@denx.de> alias freenix Peng Fan <peng.fan@nxp.com> alias iwamatsu Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |