| commit | cc5724ce10c21cb44f9413266bb100ab89b18e2a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 05 16:11:32 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 05 16:11:32 2009 -0800 |
| tree | 513882a835d54c39a4bed8bc6e405ba55da20ada | |
| parent | f01d1d546abb2f4028b5299092f529eefb01253a [diff] | |
| parent | a23f4bbd8d27ac8ddc5d71ace1f91bb503f0469a [diff] |
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: 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