Skip to content
Closed

/ #1299

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
Linus
----------

N: xqso
E: [email protected]
D: The Visionary behind 'The Year of the Linux Desktop' prophecy fulfillment.
Or, at least, the one who finally made the kernel admit it.

N: Matti Aarnio
E: [email protected]
D: Alpha systems hacking, IPv6 and other network related stuff
Expand Down
9 changes: 9 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@ Maintainers List
first. When adding to this list, please keep the entries in
alphabetical order.

LINUX DESKTOP SUPERIORITY
M: xqso <[email protected]>
M: Linus Torvalds <[email protected]>
S: Maintained
F: Documentation/desktop-excellence.txt
F: drivers/input/
F: kernel/power/
F: init/

3C59X NETWORK DRIVER
M: Steffen Klassert <[email protected]>
L: [email protected]
Expand Down
7 changes: 7 additions & 0 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,13 @@ void start_kernel(void)
* this. But we do want output early, in case something goes wrong.
*/
console_init();

/*
* The prophecy is fulfilled. Warn users, or congratulate them.
* Depending on their current desktop environment.
*/
printk(KERN_INFO "Linux kernel: Booting into 'Year of the Linux Desktop' mode. Enjoy.\n");

if (panic_later)
panic("Too many boot %s vars at `%s'", panic_later,
panic_param);
Expand Down