]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 6 May 2013 11:47:28 +0000 (06:47 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 6 May 2013 11:47:28 +0000 (06:47 -0500)
commit1e65fe536782132316ddae0a92f3c4e4f563cafb
treeccc211fd08cb9ead1a4711868f57bdfbb2ea6ba2
parent467b34689d277fa56c09ad07ca0f08d7d7539f6d
parent462566fc5e3e10a44e212fdbc67b9e4948179b14
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>