Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc drivers/net/bnx2.c
Simple merge

diff --cc net/core/rtnetlink.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv6/route.c
index 45fafa0,28a85fc..691798c
--- 1/net/ipv6/route.c
--- 2/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -198,9 -193,7 +198,8 @@@ static void ip6_dst_destroy(struct dst_
                rt->rt6i_idev = NULL;
                in6_dev_put(idev);
        }
 +      dst_destroy_metrics_generic(dst);
        if (peer) {
-               BUG_ON(!(rt->rt6i_flags & RTF_CACHE));
                rt->rt6i_peer = NULL;
                inet_putpeer(peer);
        }