Merge branch 'master' of git://git.wolf31o2.org/projs/genkernel

diff --cc AUTHORS
Simple merge

diff --cc arch/alpha/modules_load
Simple merge

diff --cc arch/ia64/modules_load
Simple merge

diff --cc arch/mips/modules_load
Simple merge

diff --cc arch/parisc/modules_load
Simple merge

diff --cc arch/parisc64/modules_load
Simple merge

diff --cc arch/ppc/modules_load
Simple merge

diff --cc arch/ppc64/modules_load
Simple merge

diff --cc arch/sparc/modules_load
Simple merge

diff --cc arch/sparc64/modules_load
Simple merge

diff --cc arch/um/modules_load
Simple merge

diff --cc arch/x86/modules_load
Simple merge

diff --cc arch/x86_64/modules_load
Simple merge

diff --cc defaults/initrd.scripts
Simple merge

diff --cc defaults/modules_load
Simple merge

diff --cc gen_cmdline.sh
Simple merge

diff --cc gen_compile.sh
Simple merge

diff --cc gen_configkernel.sh
Simple merge

diff --cc gen_determineargs.sh
Simple merge

diff --cc gen_funcs.sh
Simple merge

diff --cc gen_initramfs.sh
Simple merge

diff --cc genkernel
Simple merge

diff --cc genkernel.conf
Simple merge