diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 13:07:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-24 13:07:24 -0700 |
commit | ca1a6ba57c5fca755b4ac7a13395bca2e2e371b1 (patch) | |
tree | 1dd8f5090238d644668818c54f9f91b1c5665991 /arch/sparc64/kernel/trampoline.S | |
parent | d3073779f8362d64b804882f5f41c208c4a5e11e (diff) | |
parent | 8f3ea33a5078a09eba12bfe57424507809367756 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
sch_htb: fix "too many events" situation
connector: convert to single-threaded workqueue
[ATM]: When proc_create() fails, do some error handling work and return -ENOMEM.
[SUNGEM]: Fix NAPI assertion failure.
BNX2X: prevent ethtool from setting port type
[9P] net/9p/trans_fd.c: remove unused variable
[IPV6] net/ipv6/ndisc.c: remove unused variable
[IPV4] fib_trie: fix warning from rcu_assign_poinger
[TCP]: Let skbs grow over a page on fast peers
[DLCI]: Fix tiny race between module unload and sock_ioctl.
[SCTP]: Fix build warnings with IPV6 disabled.
[IPV4]: Fix null dereference in ip_defrag
Diffstat (limited to 'arch/sparc64/kernel/trampoline.S')
0 files changed, 0 insertions, 0 deletions