From: Sebastian Pipping <sebastian@pipping.org>
Date: Sun, 8 Jul 2012 17:18:46 +0000 (+0200)
Subject: Merge branch 'bug-421027'
X-Git-Tag: v3.4.37~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=636cbc75c14005d10361cda8f6f0b4bad280bf44;p=genkernel.git

Merge branch 'bug-421027'

Conflicts:
	ChangeLog
---

636cbc75c14005d10361cda8f6f0b4bad280bf44
diff --cc ChangeLog
index 1340d09,7b90ca8..87332a7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,9 -5,10 +5,13 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   01 Jul 2012; Sebastian Pipping <sping@gentoo.org> gen_configkernel.sh,
+   gen_package.sh:
+   Support --kernel-config=/proc/config.gz (bug #421027)
+ 
 +  08 Jul 2012; Kenny Cheng <kenny97821419@gmail.com> defaults/linuxrc:
 +  Add /run to support openrc >=0.10
 +
    11 Jun 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
    Bump version to 3.4.36