| commit | 259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Thu, 21 Feb 2013 15:38:27 +0000 (21 09:38 -0600) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Thu, 21 Feb 2013 15:38:27 +0000 (21 09:38 -0600) | ||
| tree | 017cba36bb8b71b7b2207300403d13f37d0edf8f | treesnapshot (tar.gz zip) |
| parent | cc2832a51c8ce43349967ab1b6c7aafd510e55b2 | commitdiff |
| parent | 159c9836d057d8990e71399e8a431b2b911e2885 | commitdiff |
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
# 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