Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/Makefile
Simple merge

diff --cc drivers/net/cxgb3/cxgb3_main.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/net/wimax/i2400m/i2400m.h
Simple merge

diff --cc fs/compat_ioctl.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/sock.h
Simple merge

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

diff --cc net/core/skbuff.c
index e5a8351ff12d5be925fedaad8f7d3ec0d2a3849c,c6a6b166f8d6f733a4dc9f7143bd565aaddf7e8f..33640d99c8ed65794458f4a673e45724232ef520
--- 1/net/core/skbuff.c
--- 2/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@@ -144,16 -142,7 +144,8 @@@ void skb_under_panic(struct sk_buff *sk
               skb->dev ? skb->dev->name : "<NULL>");
        BUG();
  }
 +EXPORT_SYMBOL(skb_under_panic);
  
- void skb_truesize_bug(struct sk_buff *skb)
- {
-       WARN(net_ratelimit(), KERN_ERR "SKB BUG: Invalid truesize (%u) "
-              "len=%u, sizeof(sk_buff)=%Zd\n",
-              skb->truesize, skb->len, sizeof(struct sk_buff));
- }
- EXPORT_SYMBOL(skb_truesize_bug);
- 
  /*    Allocate a new skbuff. We do this ourselves so we can fill in a few
   *    'private' fields and also do memory statistics to find all the
   *    [BEEP] leaks.

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

diff --cc net/ipv4/tcp_output.c
Simple merge