From 4d155cbf37ca909daff06dd8c7119274d0861f6c Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Sun, 16 Jan 2011 22:44:12 -0800
Subject: Merge upstream version 0.3.4. (cherry picked from commit
 21eb1c8d6fefa5dcd3a9a800b4add06d5c30c01f)

---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 3997e39..8bfc10e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* Mon Jul 27 2009
+- add SMBIOS naming policy
+- fix return error check for mmap
+
 * Wed Nov 28 2006
 - fix usage() being printed on success
 - don't assign BIOS device names to Linux virtual devices (tun0)
-- 
cgit v1.2.3