diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 15:41:33 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-25 15:41:33 -0400 |
| commit | 43cb4a02d27ad9525ad23984d4fd06972810439f (patch) | |
| tree | c705d059616356054d18c6cd50e7c9f5b16a5747 /arch/arm/mach-spear3xx/include/mach/timex.h | |
| parent | 9abf29edbb14a34f86c9e09970adada9f10ccbcf (diff) | |
| parent | 759af179c72005e61a4dd6dcf909320a134bfeee (diff) | |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into late/board
From Haojian Zhuang <haojian.zhuang@gmail.com>:
* 'board-specific' of git://github.com/hzhuang1/linux:
ARM: pxa: hx4700: Use DEFINE_RES_* macros consistently
ARM: pxa: remove eseries.h
It seems I missed this in the original pull requests for v3.6, adding
it now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-spear3xx/include/mach/timex.h')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/timex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/timex.h b/arch/arm/mach-spear3xx/include/mach/timex.h index a38cc9de876f..9f5d08bd0c44 100644 --- a/arch/arm/mach-spear3xx/include/mach/timex.h +++ b/arch/arm/mach-spear3xx/include/mach/timex.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * SPEAr3XX machine family specific timex definitions | 4 | * SPEAr3XX machine family specific timex definitions |
| 5 | * | 5 | * |
| 6 | * Copyright (C) 2009 ST Microelectronics | 6 | * Copyright (C) 2009 ST Microelectronics |
| 7 | * Viresh Kumar<viresh.kumar@st.com> | 7 | * Viresh Kumar <viresh.linux@gmail.com> |
| 8 | * | 8 | * |
| 9 | * This file is licensed under the terms of the GNU General Public | 9 | * This file is licensed under the terms of the GNU General Public |
| 10 | * License version 2. This program is licensed "as is" without any | 10 | * License version 2. This program is licensed "as is" without any |