]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Oct 2010 18:11:01 +0000 (11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Oct 2010 18:11:01 +0000 (11:11 -0700)
commit4a73a43741489a652588460e72be959e60bcb9ec
tree7479147c1832131a7c8abfcd0ee8ae1a7d07116f
parentc470af0a27bc2f84f337a50624926eac8343211e
parent173e79fb70a98b5b223f8dc09c22990d777bdd78
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  vlan: dont drop packets from unknown vlans in promiscuous mode
  Phonet: Correct header retrieval after pskb_may_pull
  um: Proper Fix for f25c80a4: remove duplicate structure field initialization
  ip_gre: Fix dependencies wrt. ipv6.
  net-2.6: SYN retransmits: Add new parameter to retransmits_timed_out()
  iwl3945: queue the right work if the scan needs to be aborted
  mac80211: fix use-after-free