From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 26 Mar 2010 16:11:52 +0000 (+0100)
Subject: Merge grub-file into mainline
X-Git-Tag: 1.99~1002
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4ff66281afc34793759defaaf5187422f11eae7;p=thirdparty%2Fgrub.git

Merge grub-file into mainline
---

e4ff66281afc34793759defaaf5187422f11eae7
diff --cc ChangeLog
index 8fd3eb176,8fd3eb176..c67e024ba
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,3 +1,16 @@@
++2010-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
++
++	Don't use __FILE__.
++
++	* genmk.rb: Add -DGRUB_FILE to all C targets.
++	* fs/reiserfs.c: Replace __FILE__ with GRUB_FILE.
++	* include/grub/list.h: Likewise.
++	* include/grub/misc.h: Likewise.
++	* include/grub/mm.h: Likewise.
++	* include/grub/test.h: Likewise.
++	* kern/mm.c: Likewise.
++	* lib/libgcrypt_wrap/cipher_wrap.h: Likewise.
++
  2010-03-26  Vladimir Serbinenko  <phcoder@gmail.com>
  
  	Sunpc partitions support.