Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 16 Nov 2007 00:34:00 +0000 (16:34 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 16 Nov 2007 00:34:00 +0000 (16:34 -0800)
commitadea27f4ba29200c989194a3f6214b652d009e83
treea4699ba7557e731570d724e09bf6e05d3e83570c
parent40787d0099676c9923e31fbdb90422d5c97cdcd5
parent7799652557d966e49512479f4d3b9079bbc01fff
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: Fix NULL pointer dereference in nf_nat_move_storage()
  [SUNHME]: VLAN support for sunhme
  [CHELSIO]: Fix skb->dev setting.
  [NETFILTER]: fix compat_nf_sockopt typo
  [INET]: Fix potential kfree on vmalloc-ed area of request_sock_queue
  [VIA_VELOCITY]: Don't oops on MTU change.
  iwl4965: fix not correctly dealing with hotunplug
  rt2x00: Fix chipset revision validation
  iwl3945: place CCK rates in front of OFDM for supported rates
  mac80211: Fix queuing of scan containing a SSID