diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:34:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:34:49 -0700 |
| commit | 2b3b29080d702e5488f214276170ab46adc40ee5 (patch) | |
| tree | 53d719e8490fda0c24d3f503078d36400c813be9 /arch/frv | |
| parent | e80eaf9904d5b19512265e1435372b2e12146a5f (diff) | |
| parent | 04045f98e0457aba7d4e6736f37eed189c48a5f7 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* '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.
Diffstat (limited to 'arch/frv')
0 files changed, 0 insertions, 0 deletions