diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:39:53 -0400 |
| commit | a4cfae13cef6a700a04b13ba1d819c0641b1b26f (patch) | |
| tree | 91aa4f8be6df4494276d1a064d9f8f2b994aa367 /include/asm-arm/arch-netx/hardware.h | |
| parent | be883da7594b0a2a02074e683673ae0e522566a4 (diff) | |
| parent | ff7512e1a2a3504649d3716a757f43807b6d26ef (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[ATM]: fix broken uses of NIPQUAD in net/atm
[SCTP]: sctp_unpack_cookie() fix
[SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
[NET]: Prevent multiple qdisc runs
[CONNECTOR]: Initialize subsystem earlier.
[NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length
Diffstat (limited to 'include/asm-arm/arch-netx/hardware.h')
0 files changed, 0 insertions, 0 deletions