commit b835c0f47f725d864bf2545f10c733b754bb6d51
author Linus Torvalds <torvalds@linux-foundation.org> Tue Dec 06 12:03:54 2011 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Dec 06 12:03:54 2011 -0800
tree f80f0d627bd81ea3f01d1bae71700a940896622a
parent 091c0f86bad6bb0b003dff2f6195508e29548648
parent 681090902eeb459a829f6f93d378a82011af3c89

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: Silence seq_scale() unused warning
  ipv4:correct description for tcp_max_syn_backlog
  pasemi_mac: Fix building as module
  netback: Fix alert message.
  r8169: fix Rx index race between FIFO overflow recovery and NAPI handler.
  r8169: Rx FIFO overflow fixes.
  ipv4: Fix peer validation on cached lookup.
  ipv4: make sure RTO_ONLINK is saved in routing cache
  iwlwifi: change the default behavior of watchdog timer
  iwlwifi: do not re-configure HT40 after associated
  iwlagn: fix HW crypto for TX-only keys
  Revert "mac80211: clear sta.drv_priv on reconfiguration"
  mac80211: fill rate filter for internal scan requests
  cfg80211: amend regulatory NULL dereference fix
  cfg80211: fix race on init and driver registration