diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /Documentation/logo.txt | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'Documentation/logo.txt')
| -rw-r--r-- | Documentation/logo.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/logo.txt b/Documentation/logo.txt index a2e62445e28e..296f0f7f67eb 100644 --- a/Documentation/logo.txt +++ b/Documentation/logo.txt | |||
| @@ -1,4 +1,13 @@ | |||
| 1 | Tux is taking a three month sabbatical to work as a barber, so Tuz is | 1 | This is the full-colour version of the currently unofficial Linux logo |
| 2 | standing in. He's taken pains to ensure you'll hardly notice. | 2 | ("currently unofficial" just means that there has been no paperwork and |
| 3 | that I have not really announced it yet). It was created by Larry Ewing, | ||
| 4 | and is freely usable as long as you acknowledge Larry as the original | ||
| 5 | artist. | ||
| 6 | |||
| 7 | Note that there are black-and-white versions of this available that | ||
| 8 | scale down to smaller sizes and are better for letterheads or whatever | ||
| 9 | you want to use it for: for the full range of logos take a look at | ||
| 10 | Larry's web-page: | ||
| 11 | |||
| 12 | http://www.isc.tamu.edu/~lewing/linux/ | ||
| 3 | 13 | ||
| 4 | Image by Andrew McGown and Josh Bush. Image is licensed CC BY-SA. | ||