diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:14:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 12:14:58 -0700 |
| commit | c3c2233d84bee397b8271923c007264eb3efa67b (patch) | |
| tree | 3a6d7d9644f926cdf00cad03920bb238fc6f5b15 /net/atm | |
| parent | f9247273cb69ba101877e946d2d83044409cc8c5 (diff) | |
| parent | f867e6af94239a04ec23aeec2fcda5aa58e41db7 (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:
pkt_sched: sch_sfq: dump a real number of flows
atm: [fore200e] use MODULE_FIRMWARE() and other suggested cleanups
netfilter: make security table depend on NETFILTER_ADVANCED
tcp: Clear probes_out more aggressively in tcp_ack().
e1000e: fix e1000_netpoll(), remove extraneous e1000_clean_tx_irq() call
net: Update entry in af_family_clock_key_strings
netdev: Remove warning from __netif_schedule().
sky2: don't stop queue on shutdown
Diffstat (limited to 'net/atm')
0 files changed, 0 insertions, 0 deletions