Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IEEE80211]: avoid integer underflow for runt rx frames
  [TCP]: secure_tcp_sequence_number() should not use a too fast clock
  [SFQ]: Remove artificial limitation for queue limit.

...

This commit is contained in:

Linus Torvalds 2007-10-02 10:34:49 -07:00

parent e80eaf9904 04045f98e0

commit 2b3b29080d

3 changed files with 43 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

drivers/char/random.c

View file

6

net/ieee80211/ieee80211_rx.c

View file

47

net/sched/sch_sfq.c

View file