summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 20:48:20 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 20:48:20 +0200
commitd1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec (patch)
treef7945f307e1fdedb19ad61c7fc40ec0a1417a204 /ipc
parentMerge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh (diff)
parentARM: mmp: add missing irqs.h (diff)
downloadlinux-d1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec.tar.xz
linux-d1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec.zip
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 'ipc')
0 files changed, 0 insertions, 0 deletions