From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 29 Aug 2010 16:54:50 +0000 (+0200)
Subject: merge mainline into newreloc
X-Git-Tag: 1.99~629^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9c8da60f3315503fd17ad07dc2aa2d2caed55f8;p=thirdparty%2Fgrub.git

merge mainline into newreloc
---

a9c8da60f3315503fd17ad07dc2aa2d2caed55f8
diff --cc grub-core/Makefile.core.def
index 8533d3131,5961e8697..74fd1d3ac
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -166,8 -166,10 +166,9 @@@ kernel = 
    emu = kern/emu/mm.c;
    emu = kern/emu/time.c;
  
 -  extra_dist = kern/i386/loader.S;
    extra_dist = kern/i386/realmode.S;
    extra_dist = kern/i386/pc/lzma_decode.S;
+   extra_dist = kern/mips/cache_flush.S;
  };
  
  program = {