diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /lib/vsprintf.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index add0446dd921..af4aaa6c36f3 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
| @@ -938,7 +938,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr, | |||
| 938 | * IPv4 uses dot-separated decimal with leading 0's (010.123.045.006) | 938 | * IPv4 uses dot-separated decimal with leading 0's (010.123.045.006) |
| 939 | * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order | 939 | * - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order |
| 940 | * - 'I6c' for IPv6 addresses printed as specified by | 940 | * - 'I6c' for IPv6 addresses printed as specified by |
| 941 | * http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt | 941 | * http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00 |
| 942 | * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form | 942 | * - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form |
| 943 | * "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" | 943 | * "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" |
| 944 | * Options for %pU are: | 944 | * Options for %pU are: |
| @@ -1224,7 +1224,7 @@ qualifier: | |||
| 1224 | * %pI6 print an IPv6 address with colons | 1224 | * %pI6 print an IPv6 address with colons |
| 1225 | * %pi6 print an IPv6 address without colons | 1225 | * %pi6 print an IPv6 address without colons |
| 1226 | * %pI6c print an IPv6 address as specified by | 1226 | * %pI6c print an IPv6 address as specified by |
| 1227 | * http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt | 1227 | * http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00 |
| 1228 | * %pU[bBlL] print a UUID/GUID in big or little endian using lower or upper | 1228 | * %pU[bBlL] print a UUID/GUID in big or little endian using lower or upper |
| 1229 | * case. | 1229 | * case. |
| 1230 | * %n is ignored | 1230 | * %n is ignored |