mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-11 15:11:48 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
51c24aaaca
1380 changed files with 31844 additions and 11830 deletions
|
|
@ -938,7 +938,7 @@ static char *uuid_string(char *buf, char *end, const u8 *addr,
|
|||
* IPv4 uses dot-separated decimal with leading 0's (010.123.045.006)
|
||||
* - '[Ii]4[hnbl]' IPv4 addresses in host, network, big or little endian order
|
||||
* - 'I6c' for IPv6 addresses printed as specified by
|
||||
* http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt
|
||||
* http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
|
||||
* - 'U' For a 16 byte UUID/GUID, it prints the UUID/GUID in the form
|
||||
* "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
||||
* Options for %pU are:
|
||||
|
|
@ -1224,7 +1224,7 @@ qualifier:
|
|||
* %pI6 print an IPv6 address with colons
|
||||
* %pi6 print an IPv6 address without colons
|
||||
* %pI6c print an IPv6 address as specified by
|
||||
* http://www.ietf.org/id/draft-kawamura-ipv6-text-representation-03.txt
|
||||
* http://tools.ietf.org/html/draft-ietf-6man-text-addr-representation-00
|
||||
* %pU[bBlL] print a UUID/GUID in big or little endian using lower or upper
|
||||
* case.
|
||||
* %n is ignored
|
||||
|
|
|
|||
Loading…
Reference in a new issue