diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:23:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:23:08 -0500 |
| commit | 5d5dde2ed928677028ef859f48a32a503b01c636 (patch) | |
| tree | 954eb70d7b8095de8e95f22c6b6759b55bc5edb4 /arch/parisc/kernel/pci-dma.c | |
| parent | dafdcfba62f7ef23045f024a305168cac1c07590 (diff) | |
| parent | aef8811abbc9249a2bd59bd2331bbe523df05d17 (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: (25 commits)
[XFRM]: Fix oops in xfrm4_dst_destroy()
[XFRM_TUNNEL]: Reload header pointer after pskb_may_pull/pskb_expand_head
[IPV4]: Use random32() in net/ipv4/multipath
[BRIDGE]: eliminate workqueue for carrier check
[BRIDGE]: get rid of miscdevice include
[IPV6]: Fix __ipv6_addr_type() export in correct place.
[IPV4] devinet: Register inetdev earlier.
[IPV6] ADDRCONF: Register inet6_dev earlier.
[IPV6] ADDRCONF: Manage prefix route corresponding to address manually added.
[IPV6] IP6TUNNEL: Use update_pmtu() of dst on xmit.
[IPV6] ADDRCONF: Statically link __ipv6_addr_type() for sunrpc subsystem.
[IPV4]: Correct links in net/ipv4/Kconfig
[SCTP]: Strike the transport before updating rto.
[SCTP]: Fix connection hang/slowdown with PR-SCTP
[TCP]: Fix MD5 signature pool locking.
[TG3]: TSO workaround fixes.
[AF_PACKET]: Remove unnecessary casts.
[IPV6]: Adjust inet6_exit() cleanup sequence against inet6_init()
[IPSEC]: More fix is needed for __xfrm6_bundle_create().
[IRDA] net/irda/: proper prototypes
...
Diffstat (limited to 'arch/parisc/kernel/pci-dma.c')
0 files changed, 0 insertions, 0 deletions