From: Anthony Liguori <aliguori@us.ibm.com>
Date: Sun, 20 Dec 2009 01:31:18 +0000 (-0600)
Subject: Update version and changelog for 0.12.1
X-Git-Tag: v0.12.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe1b69708c72b163d3acdf2bb012e169d2d3dda0;p=thirdparty%2Fqemu.git

Update version and changelog for 0.12.1

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/Changelog b/Changelog
index 152feaacb55..ee2af730340 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+version 0.12.1:
+  - loader: fix rom loading at address 0 (fixes target-arm) (Aurelien Jarno)
+  - loader: fix rom_copy (fixes multiboot) (Kevin Wolf)
+	
 version 0.12.0:
 
   - Update to SeaBIOS 0.5.0
diff --git a/VERSION b/VERSION
index ac454c6a1fc..34a83616bb5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.12.0
+0.12.1