tree 9d33689be7415388ed57f437faaae883a4978a85
parent d3d52d687a770973b459d8a92ec1adbba3f60c4b
parent 321dee6e8b235c496f0a068a72d8df9a4e13ceb9
author Linus Torvalds <torvalds@linux-foundation.org> 1238464003 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1238464003 -0700

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  wireless: remove duplicated .ndo_set_mac_address
  netfilter: xtables: fix IPv6 dependency in the cluster match
  tg3: Add GRO support.
  niu: Add GRO support.
  ucc_geth: Fix use-after-of_node_put() in ucc_geth_probe().
  gianfar: Fix use-after-of_node_put() in gfar_of_init().
  kernel: remove HIPQUAD()
  netpoll: store local and remote ip in net-endian
  netfilter: fix endian bug in conntrack printks
  dmascc: fix incomplete conversion to network_device_ops
  gso: Fix support for linear packets
  skbuff.h: fix missing kernel-doc
  ni5010: convert to net_device_ops