diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:34:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-22 19:34:09 -0700 |
| commit | d6e8823e7bf423c6850c68f716d2f5f693c97447 (patch) | |
| tree | dafa7c94a3acbb432271ac6c80f2fc7256b2d887 /drivers/parport/probe.c | |
| parent | f64cd9de37bfd97c8d23a05a9f50759ff7195212 (diff) | |
| parent | 848c29fd648e78fa87d0e399223826ce5dfc1b7a (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:
[NETFILTER]: nat: avoid rerouting packets if only XFRM policy key changed
[NETFILTER]: nf_conntrack_netlink: add missing dependency on NF_NAT
[NET]: fix up misplaced inlines.
[SCTP]: Correctly reset ssthresh when restarting association
[BRIDGE]: Fix fdb RCU race
[NET]: Fix fib_rules dump race
[XFRM]: ipsecv6 needs a space when printing audit record.
[X25] x25_forward_call(): fix NULL dereferences
[SCTP]: Reset some transport and association variables on restart
[SCTP]: Increment error counters on user requested HBs.
[SCTP]: Clean up stale data during association restart
[IrDA]: Calling ppp_unregister_channel() from process context
[IrDA]: irttp_dup spin_lock initialisation
[IrDA]: Delay needed when uploading firmware chunks
Diffstat (limited to 'drivers/parport/probe.c')
0 files changed, 0 insertions, 0 deletions