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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 305d9ee6d7db..cb8856b1d951 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -692,7 +692,7 @@ static void ndisc_solicit(struct neighbour *neigh, struct sk_buff *skb)
                 if (!(neigh->nud_state & NUD_VALID)) {
                         ND_PRINTK1(KERN_DEBUG
                                    "%s(): trying to ucast probe in NUD_INVALID: "
-                                   "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                                   NIP6_FMT "\n",
                                    __FUNCTION__,
                                    NIP6(*target));
                 }