From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 4 Jun 2012 19:43:10 +0000 (+0200)
Subject: Merge branch 'bug-418463'
X-Git-Tag: v3.4.34~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a4438ec946201eac5fda78f21d7014d4a46ebcdc;p=genkernel.git

Merge branch 'bug-418463'

Conflicts:
	ChangeLog
---

a4438ec946201eac5fda78f21d7014d4a46ebcdc
diff --cc ChangeLog
index 76102bd,6047d4f..016128a
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,11 -5,9 +5,14 @@@
  # Distributed under the GPL v2
  # $Id$
  
+   02 Jun 2012; Sebastian Pipping <sping@gentoo.org> defaults/linuxrc:
+   Support bind mounts from /etc/initramfs.mounts (bug #418463)
+ 
 +  02 Jun 2012; Sebastian Pipping <sping@gentoo.org> arch/x86/modules_load,
 +  arch/x86_64/modules_load, defaults/modules_load:
 +  Make sure that cbc.ko and aes*.ko needed for cbc-essiv:sha256 (=default) disk
 +  encryption are included with the initramfs (bug #416973)
 +
    28 May 2012; Sebastian Pipping <sping@gentoo.org> gen_funcs.sh:
    Fix an e2fsprogs compilation leftover (bug #417095), reported by Juergen Rose