| commit | b2510b1696730307e7a388ea04132236ab45ac20 | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Sun, 24 Jun 2007 16:42:15 +0000 (24 09:42 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Sun, 24 Jun 2007 16:42:15 +0000 (24 09:42 -0700) | ||
| tree | bfdf9d950f52f1fba9316452b9576e561dca42d3 | treesnapshot (tar.gz zip) |
| parent | c8cbee61c9d53ee28473ad33bbb54f6a88f5e3af | commitdiff |
| parent | 5b5a60da281c767196427ce8144deae6ec46b389 | commitdiff |
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Make skb_seq_read unmap the last fragment
[NET]: Re-enable irqs before pushing pending DMA requests
[TCP] tcp_read_sock: Allow recv_actor() return return negative error value.
[PPP]: Fix osize too small errors when decoding mppe.
[PPP]: Revert 606f585e363527da9feaed79465132c0c661fd9e
[TIPC]: Fix infinite loop in netlink handler
[SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
[IPV4]: include sysctl.h from inetdevice.h
[IPV6] NDISC: Fix thinko to control Router Preference support.
[NETFILTER]: nfctnetlink: Don't allow to change helper
[NETFILTER]: nf_conntrack_sip: add missing message types containing RTP info
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Make skb_seq_read unmap the last fragment
[NET]: Re-enable irqs before pushing pending DMA requests
[TCP] tcp_read_sock: Allow recv_actor() return return negative error value.
[PPP]: Fix osize too small errors when decoding mppe.
[PPP]: Revert 606f585e363527da9feaed79465132c0c661fd9e
[TIPC]: Fix infinite loop in netlink handler
[SKBUFF]: Fix incorrect config #ifdef around skb_copy_secmark
[IPV4]: include sysctl.h from inetdevice.h
[IPV6] NDISC: Fix thinko to control Router Preference support.
[NETFILTER]: nfctnetlink: Don't allow to change helper
[NETFILTER]: nf_conntrack_sip: add missing message types containing RTP info