diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 14:48:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 14:48:20 -0400 |
| commit | d1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec (patch) | |
| tree | f7945f307e1fdedb19ad61c7fc40ec0a1417a204 /arch/arm/boot | |
| parent | 0a276d1675bc1b8de3ba269ba64b8f3e288d8309 (diff) | |
| parent | bac6f61550043195ee59e9cef0db67af23baf11e (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"A few fixes for merge window fallout, and a bugfix for timer resume on
PRIMA2."
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: mmp: add missing irqs.h
arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs
ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes
ARM: mxc: Include missing irqs.h header
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi index e1fa7e6edfe8..71d6b5d0daf1 100644 --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | * License version 2. This program is licensed "as is" without any | 12 | * License version 2. This program is licensed "as is" without any |
| 13 | * warranty of any kind, whether express or implied. | 13 | * warranty of any kind, whether express or implied. |
| 14 | * | 14 | * |
| 15 | * Contains definitions specific to the Armada 370 SoC that are not | 15 | * Contains definitions specific to the Armada XP SoC that are not |
| 16 | * common to all Armada SoCs. | 16 | * common to all Armada SoCs. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||