diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 10:30:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 10:30:12 -0700 |
| commit | 1feb17e286339382a1ae36e0fecc4d88c2d7f123 (patch) | |
| tree | f90019dea4e08d290710a7c3aaae0bb2bf239a40 /arch/mips/emma2rh | |
| parent | dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5 (diff) | |
| parent | 25442cafb8cc3d979418caccabc91260707a0947 (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:
[NETPOLL]: Fixups for 'fix soft lockup when removing module'
[NET]: net/core/netevent.c should #include <net/netevent.h>
[NETFILTER]: nf_conntrack_h323: add checking of out-of-range on choices' index values
[NET] skbuff: remove export of static symbol
SCTP: Add scope_id validation for link-local binds
SCTP: Check to make sure file is valid before setting timeout
SCTP: Fix thinko in sctp_copy_laddrs()
Diffstat (limited to 'arch/mips/emma2rh')
0 files changed, 0 insertions, 0 deletions