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 <[email protected]> <[email protected]> Christian Kohn <[email protected]> <[email protected]> Dirk Behme <[email protected]> Durga Challa <[email protected]> <[email protected]> -Eugen Hristev <[email protected]> <[email protected]> +Eugen Hristev <[email protected]> <[email protected]> +Eugen Hristev <[email protected]> <[email protected]> Fabio Estevam <[email protected]> Harini Katakam <[email protected]> <[email protected]> Harsha <[email protected]> <[email protected]> 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 <[email protected]> alias bmeng Bin Meng <[email protected]> alias danielschwierzeck Daniel Schwierzeck <[email protected]> alias dinh Dinh Nguyen <[email protected]> -alias ehristev Eugen Hristev <[email protected]> +alias ehristev Eugen Hristev <[email protected]> alias hs Heiko Schocher <[email protected]> alias freenix Peng Fan <[email protected]> alias iwamatsu Nobuhiro Iwamatsu <[email protected]> |