From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 18 Mar 2013 15:11:53 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: v3.9-rc4~36
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6210d421c20f12ef4e8c9826973478beb104114d;p=users%2Fhch%2Fuuid.git

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
 "Just three fixes this time - a fix for a fix for our memset function,
  fixing the dummy clockevent so that it doesn't interfere with real
  hardware clockevents, and fixing a build error for Tegra."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7675/1: amba: tegra-ahb: Fix build error w/ PM_SLEEP w/o PM_RUNTIME
  ARM: 7674/1: smp: Avoid dummy clockevent being preferred over real hardware clock-event
  ARM: 7670/1: fix the memset fix
---

6210d421c20f12ef4e8c9826973478beb104114d