diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 17:12:32 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-05-19 17:12:32 +0300 |
| commit | c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015 (patch) | |
| tree | a80672ee82fcc3d9c8d486e53731eb19cd968eb0 /kernel/Makefile | |
| parent | daa67b4b70568a07fef3cffacb2055891bf42ddb (diff) | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| download | linux-c3b5d3cea508d2c8ff493ef18c45a9cc58fb7015.tar.xz | |
Merge branch 'linus' into timers/core
Make sure the upstream fixes are applied before adding further
modifications.
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 0f8f8b0bc1bf..60c302cfb4d3 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -197,9 +197,9 @@ x509.genkey: @echo >>x509.genkey "x509_extensions = myexts" @echo >>x509.genkey @echo >>x509.genkey "[ req_distinguished_name ]" - @echo >>x509.genkey "O = Magrathea" - @echo >>x509.genkey "CN = Glacier signing key" - @echo >>x509.genkey "emailAddress = slartibartfast@magrathea.h2g2" + @echo >>x509.genkey "#O = Unspecified company" + @echo >>x509.genkey "CN = Build time autogenerated kernel key" + @echo >>x509.genkey "#emailAddress = unspecified.user@unspecified.company" @echo >>x509.genkey @echo >>x509.genkey "[ myexts ]" @echo >>x509.genkey "basicConstraints=critical,CA:FALSE" |