From: Sebastian Pipping Date: Thu, 20 Jan 2011 14:39:31 +0000 (+0100) Subject: Merge branch 'master' into experimental X-Git-Tag: v3.4.12~1^2~11 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=901be4dec29197200fa7d6892a4542e1c45f3d1e;p=genkernel.git Merge branch 'master' into experimental Conflicts: ChangeLog --- 901be4dec29197200fa7d6892a4542e1c45f3d1e diff --cc ChangeLog index 6f887d3,d27bb0b..1a0a907 --- a/ChangeLog +++ b/ChangeLog @@@ -5,13 -5,20 +5,27 @@@ # Distributed under the GPL v2 # $Id$ - 17 Jan 2011; Sebastian Pipping ChangeLog: ++ 20 Jan 2011; Sebastian Pipping ChangeLog: + Add proper mdadm support (bug #282100) + + Special thanks: + - Laurent Pinchart (mdmon/IMSM support) + - Matthias Dahl (Initial patch) + + 20 Jan 2011; Sebastian Pipping genkernel: + Bump version to 3.4.11.1 + + 20 Jan 2011; Sebastian Pipping gen_configkernel.sh: + Move application of kernel config after "make mrproper" as that deletes + .config (whereas "make clean" does not) (bug #351906) + + Special thanks: + - Xake + + 20 Jan 2011; Sebastian Pipping + 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 genkernel: Bump version to 3.4.11