Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c
index 4f4beefa7830..26ef95d5fe38 100644
--- a/net/tipc/dbg.c
+++ b/net/tipc/dbg.c
@@ -81,7 +81,7 @@ void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 sz)
 
         pb->crs = pb->buf = raw;
         pb->size = sz;
-        pb->next = 0;
+        pb->next = NULL;
         pb->buf[0] = 0;
         pb->buf[sz-1] = ~0;
 }
@@ -216,7 +216,7 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...)
                         }
                 }
                 pb_next = pb->next;
-                pb->next = 0;
+                pb->next = NULL;
                 pb = pb_next;
         }
         spin_unlock_bh(&print_lock);