summaryrefslogtreecommitdiffstats
path: root/Documentation/logo.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-23 10:07:49 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-23 10:07:49 +0100
commitb3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (patch)
tree3f6150291664b4c62e328f6b1dcff79b54db612a /Documentation/logo.txt
parentsparseirq, powerpc/cell: fix unused variable warning in interrupt.c (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff)
downloadlinux-b3e3b302cf6dc8d60b67f0e84d1fa5648889c038.tar.xz
linux-b3e3b302cf6dc8d60b67f0e84d1fa5648889c038.zip
Merge branches 'irq/sparseirq' and 'linus' into irq/core
Diffstat (limited to 'Documentation/logo.txt')
-rw-r--r--Documentation/logo.txt15
1 files changed, 3 insertions, 12 deletions
diff --git a/Documentation/logo.txt b/Documentation/logo.txt
index 296f0f7f67eb..a2e62445e28e 100644
--- a/Documentation/logo.txt
+++ b/Documentation/logo.txt
@@ -1,13 +1,4 @@
-This is the full-colour version of the currently unofficial Linux logo
-("currently unofficial" just means that there has been no paperwork and
-that I have not really announced it yet). It was created by Larry Ewing,
-and is freely usable as long as you acknowledge Larry as the original
-artist.
-
-Note that there are black-and-white versions of this available that
-scale down to smaller sizes and are better for letterheads or whatever
-you want to use it for: for the full range of logos take a look at
-Larry's web-page:
-
- http://www.isc.tamu.edu/~lewing/linux/
+Tux is taking a three month sabbatical to work as a barber, so Tuz is
+standing in. He's taken pains to ensure you'll hardly notice.
+Image by Andrew McGown and Josh Bush. Image is licensed CC BY-SA.