diff --git a/[refs] b/[refs]
index 6404956622ec..777ea6f0a434 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5d52273b92913399e78fc4877f89d38ef8b367a
+refs/heads/master: 56690c2151d33534f0537fd03c533eda81d96f0f
diff --git a/trunk/Documentation/networking/can.txt b/trunk/Documentation/networking/can.txt
index f1b2de170929..641d2afacffa 100644
--- a/trunk/Documentation/networking/can.txt
+++ b/trunk/Documentation/networking/can.txt
@@ -281,10 +281,10 @@ solution for a couple of reasons:
             sa_family_t can_family;
             int         can_ifindex;
             union {
-                    struct { canid_t rx_id, tx_id; } tp16;
-                    struct { canid_t rx_id, tx_id; } tp20;
-                    struct { canid_t rx_id, tx_id; } mcnet;
-                    struct { canid_t rx_id, tx_id; } isotp;
+                    /* transport protocol class address info (e.g. ISOTP) */
+                    struct { canid_t rx_id, tx_id; } tp;
+
+                    /* reserved for future CAN protocols address information */
             } can_addr;
     };