tree ee4f104a7562e1fd76882bc40f2de7d90812e1df
parent 37224470c8c6d90a4062e76a08d4dc1fcf91fc89
parent ca6bb5d7ab22ac79f608fe6cbc6b12de6a5a19f0
author Linus Torvalds <torvalds@g5.osdl.org> 1151074801 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1151074801 -0700

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Require CAP_NET_ADMIN to create tuntap devices.
  [NET]: fix net-core kernel-doc
  [TCP]: Move inclusion of <linux/dmaengine.h> to correct place in <linux/tcp.h>
  [IPSEC]: Handle GSO packets
  [NET]: Added GSO toggle
  [NET]: Add software TSOv4
  [NET]: Add generic segmentation offload
  [NET]: Merge TSO/UFO fields in sk_buff
  [NET]: Prevent transmission after dev_deactivate
  [IPV6] ADDRCONF: Fix default source address selection without CONFIG_IPV6_PRIVACY
  [IPV6]: Fix source address selection.
  [NET]: Avoid allocating skb in skb_pad