Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
commitcc5724ce10c21cb44f9413266bb100ab89b18e2a
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:11:32 +0000 (5 16:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:11:32 +0000 (5 16:11 -0800)
tree513882a835d54c39a4bed8bc6e405ba55da20ada
parentf01d1d546abb2f4028b5299092f529eefb01253a
parenta23f4bbd8d27ac8ddc5d71ace1f91bb503f0469a
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  Revert "tcp: Always set urgent pointer if it's beyond snd_nxt"
  ipv6: Copy cork options in ip6_append_data
  udp: Fix UDP short packet false positive
  gianfar: Fix potential soft reset race
  gianfar: Fix BD_LENGTH_MASK definition
  cxgb3: Fix lro switch
  iwlwifi: save PCI state before suspend, restore after resume
  iwlwifi: clean key table in iwl_clear_stations_table