commit d1b113bb028999e82a8528e1484be8c23fb5a7d9
author Linus Torvalds <torvalds@linux-foundation.org> Mon Aug 23 18:30:30 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Aug 23 18:30:30 2010 -0700
tree 18be926b8f7721e98d6a4517ced58b54937645fb
parent 9c5ea3675dbe4853eea747542da257c3e6f18de2
parent cca77b7c81876d819a5806f408b3c29b5b61a815

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: (27 commits)
  netfilter: fix CONFIG_COMPAT support
  isdn/avm: fix build when PCMCIA is not enabled
  header: fix broken headers for user space
  e1000e: don't check for alternate MAC addr on parts that don't support it
  e1000e: disable ASPM L1 on 82573
  ll_temac: Fix poll implementation
  netxen: fix a race in netxen_nic_get_stats()
  qlnic: fix a race in qlcnic_get_stats()
  irda: fix a race in irlan_eth_xmit()
  net: sh_eth: remove unused variable
  netxen: update version 4.0.74
  netxen: fix inconsistent lock state
  vlan: Match underlying dev carrier on vlan add
  ibmveth: Fix opps during MTU change on an active device
  ehea: Fix synchronization between HW and SW send queue
  bnx2x: Update bnx2x version to 1.52.53-4
  bnx2x: Fix PHY locking problem
  rds: fix a leak of kernel memory
  netlink: fix compat recvmsg
  netfilter: fix userspace header warning
  ...