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

diff --combined include/linux/skbuff.h
index eb2e837afaf3f9a44fb82c0d4c591f6a72ae53eb,55d67300fa10d128fd4254adff8a78fc05100a78..5fd389162f014ccb053d8563de6ce2a16cedd90f
--- 1/include/linux/skbuff.h
--- 2/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@@ -168,7 -168,6 +168,7 @@@ struct skb_shared_hwtstamps 
   * @software:         generate software time stamp
   * @in_progress:      device driver is going to provide
   *                    hardware time stamp
 + * @flags:            all shared_tx flags
   *
   * These flags are attached to packets as part of the
   * &skb_shared_info. Use skb_tx() to get a pointer.
@@@ -237,6 -236,8 +237,8 @@@ enum 
        SKB_GSO_TCP_ECN = 1 << 3,
  
        SKB_GSO_TCPV6 = 1 << 4,
+ 
+       SKB_GSO_FCOE = 1 << 5,
  };
  
  #if BITS_PER_LONG > 32