From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 6 May 2013 11:47:28 +0000 (-0500)
Subject: Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1e65fe536782132316ddae0a92f3c4e4f563cafb;p=qemu.git

Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging

# By Jean-Christophe DUBOIS
# Via Peter Maydell
* pmaydell/arm-devs.next:
  i.MX: implement a more correct version of EPIT timer.

Message-id: 1367603215-5120-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

1e65fe536782132316ddae0a92f3c4e4f563cafb