commit:     b33fa5c2b6145e422ef01a889a2b2e9b04fbe00b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 16:11:21 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 16:11:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=b33fa5c2

Merge branch 'master' into aufs

 arch/alpha/config.sh              |    3 +-
 arch/arm/config.sh                |    3 +-
 arch/ia64/config.sh               |    3 +-
 arch/mips/config.sh               |    2 +
 arch/parisc/config.sh             |    3 +-
 arch/parisc64/config.sh           |    3 +-
 arch/ppc/config.sh                |    3 +-
 arch/ppc64/config.sh              |    3 +-
 arch/{ia64 => s390}/config.sh     |    5 +-
 arch/s390/kernel-config           | 1155 +++++++++++++++++++++++++++++++++++++
 arch/{alpha => s390}/modules_load |    0
 arch/sparc/config.sh              |    3 +-
 arch/sparc64/config.sh            |    5 +-
 arch/um/config.sh                 |    3 +-
 arch/x86/config.sh                |    3 +-
 arch/x86_64/config.sh             |    3 +-
 defaults/config.sh                |    4 +-
 defaults/initrd.scripts           |    2 +-
 doc/genkernel.8.txt               |    5 +
 gen_cmdline.sh                    |    8 +-
 gen_compile.sh                    |    2 +-
 gen_determineargs.sh              |    1 +
 gen_initramfs.sh                  |   10 +
 genkernel.conf                    |   16 +-
 24 files changed, 1226 insertions(+), 22 deletions(-)

Reply via email to