From: Sebastian Pipping <sebastian@pipping.org>
Date: Thu, 20 Jan 2011 14:21:43 +0000 (+0100)
Subject: Merge branch 'bug-351906'
X-Git-Tag: v3.4.11.1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0142b1d12ee775f307f6eb3e8a60161eba3d679;p=genkernel.git

Merge branch 'bug-351906'

Conflicts:
	ChangeLog
---

f0142b1d12ee775f307f6eb3e8a60161eba3d679
diff --cc ChangeLog
index 8e1bc2f,686fcc3..cce54ee
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,10 -5,10 +5,14 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh:
+   Move application of kernel config after "make mrproper" as that deletes
+   .config (whereas "make clean" does not) (bug #351906)
+ 
 +  20 Jan 2011; Sebastian Pipping <sping@gentoo.org>
 +  patches/busybox/1.18.1/1.18.1-mdstart.diff:
 +  busybox 1.18.1: Return of mdstart as an applet (regression) (bug #351909)
 +
    16 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
    Bump version to 3.4.11