From 79eb433c91698edc91a5912f47a4fe333996f87e Mon Sep 17 00:00:00 2001
From: Alex Lorca <alex.lorca@gmail.com>
Date: Mon, 7 Jun 2010 01:01:22 -0700
Subject: [PATCH] --- yaml --- r: 202687 b: refs/heads/master c:
 fe33147a58e7d1d3086bf823aabfd491d843be82 h: refs/heads/master i:   202685:
 20ec2fdb0be300ac4dd436342e368196c49923c9   202683:
 e73647a45bd5119ea889c6c1072c235d6154f2a9   202679:
 a9b237f8080ea76fc8a4ad34c765168527e81569   202671:
 7acf5f7e53c55e67fd3bd30e9cdc554b61746310   202655:
 d76163caadfcdf08fdacfff31821b60b6b88dc5a   202623:
 8ebc8d008879281728497348def7b2d443da955d v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f78e14cec53a..2b69b7694e72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8b690f98baf9fb1902b8eeab801351ea603fa3a
+refs/heads/master: fe33147a58e7d1d3086bf823aabfd491d843be82
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 2cf7f9f7e775..f9ce0db41cd6 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -156,7 +156,7 @@ static const char *const af_family_key_strings[AF_MAX+1] = {
   "sk_lock-27"       , "sk_lock-28"          , "sk_lock-AF_CAN"      ,
   "sk_lock-AF_TIPC"  , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV"        ,
   "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN"     , "sk_lock-AF_PHONET"   ,
-  "sk_lock-AF_IEEE802154",
+  "sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" ,
   "sk_lock-AF_MAX"
 };
 static const char *const af_family_slock_key_strings[AF_MAX+1] = {
@@ -172,7 +172,7 @@ static const char *const af_family_slock_key_strings[AF_MAX+1] = {
   "slock-27"       , "slock-28"          , "slock-AF_CAN"      ,
   "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,
   "slock-AF_RXRPC" , "slock-AF_ISDN"     , "slock-AF_PHONET"   ,
-  "slock-AF_IEEE802154",
+  "slock-AF_IEEE802154", "slock-AF_CAIF" ,
   "slock-AF_MAX"
 };
 static const char *const af_family_clock_key_strings[AF_MAX+1] = {
@@ -188,7 +188,7 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = {
   "clock-27"       , "clock-28"          , "clock-AF_CAN"      ,
   "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
   "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,
-  "clock-AF_IEEE802154",
+  "clock-AF_IEEE802154", "clock-AF_CAIF" ,
   "clock-AF_MAX"
 };