From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 21 Feb 2013 15:38:27 +0000 (-0600)
Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f;p=qemu.git

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

# By Alin Tomescu (1) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  .gitignore: Ignore optionrom/*.asm
  ppc: fix bamboo >256MB RAM initialization in hw/ppc4xx_devs.c
  Add some missing qtest binaries to .gitignore
  xilinx_axienet.c: Assert no error when making link
  Remove forward declaration of non-existant variable
---

259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f