| commit | d1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 02 11:48:20 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Aug 02 11:48:20 2012 -0700 |
| tree | f7945f307e1fdedb19ad61c7fc40ec0a1417a204 | |
| 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