Merge branch 'master' into experimental

Conflicts:
	ChangeLog

diff --cc ChangeLog
index 6f887d398d801ae9339daa92ae29cb93fe7cef6e,d27bb0ba43d0f1923147ea69a1e6c918fd47ed1c..1a0a90798db67d6f00a13599845eff54159a217e
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -5,13 -5,20 +5,27 @@@
  # Distributed under the GPL v2
  # $Id$
  
-   17 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
++  20 Jan 2011; Sebastian Pipping <sping@gentoo.org> ChangeLog:
 +  Add proper mdadm support (bug #282100)
 +
 +  Special thanks:
 +  - Laurent Pinchart (mdmon/IMSM support)
 +  - Matthias Dahl (Initial patch)
 +
+   20 Jan 2011; Sebastian Pipping <sping@gentoo.org> genkernel:
+   Bump version to 3.4.11.1
+ 
+   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)
+ 
+   Special thanks:
+   - Xake
+ 
+   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
  

diff --cc gen_configkernel.sh
Simple merge