diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:59:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:59:41 -0700 |
commit | d85f57938ad1d674dff8077a2e6a36a45dbe0e22 (patch) | |
tree | 4a3343918da062ca5270429cd9764b0266031463 /include/asm-s390/termbits.h | |
parent | acbbe6c28a914db837ad8b75773b0a8f873a718a (diff) | |
parent | 45dfd5b5dd20f17fe23dafc5cfe921474d27f849 (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:
[PPP_MPPE]: Don't put InterimKey on the stack
SCTP : Add paramters validity check for ASCONF chunk
SCTP: Discard OOTB packetes with bundled INIT early.
SCTP: Clean up OOTB handling and fix infinite loop processing
SCTP: Explicitely discard OOTB chunks
SCTP: Send ABORT chunk with correct tag in response to INIT ACK
SCTP: Validate buffer room when processing sequential chunks
[PATCH] mac80211: fix initialisation when built-in
[PATCH] net/mac80211/wme.c: fix sparse warning
[PATCH] cfg80211: fix initialisation if built-in
[PATCH] net/wireless/sysfs.c: Shut up build warning
Diffstat (limited to 'include/asm-s390/termbits.h')
0 files changed, 0 insertions, 0 deletions