From f5d68ac73e013d5e72e72f5096efc1b47c6121a6 Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <oliver@hartkopp.net>
Date: Wed, 23 Jul 2008 14:06:04 -0700
Subject: [PATCH] --- yaml --- r: 105576 b: refs/heads/master c:
 b4942af65028c5eb516fdd9053020ccb2ee186ce h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8090bda20a59..ed3f3a17b65a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b3ab1dbd401b36ba2f9bfee2d2dae252fd62cd8
+refs/heads/master: b4942af65028c5eb516fdd9053020ccb2ee186ce
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 10a64d57078c..91f8bbc93526 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -180,7 +180,7 @@ static const char *af_family_clock_key_strings[AF_MAX+1] = {
   "clock-AF_ASH"   , "clock-AF_ECONET"   , "clock-AF_ATMSVC"   ,
   "clock-21"       , "clock-AF_SNA"      , "clock-AF_IRDA"     ,
   "clock-AF_PPPOX" , "clock-AF_WANPIPE"  , "clock-AF_LLC"      ,
-  "clock-27"       , "clock-28"          , "clock-29"          ,
+  "clock-27"       , "clock-28"          , "clock-AF_CAN"      ,
   "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
   "clock-AF_RXRPC" , "clock-AF_MAX"
 };