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: (45 commits) [IPV4]: Restore multipath routing after rt_next changes. [XFRM] IPV6: Fix outbound RO transformation which is broken by IPsec tunnel patch. [NET]: Reorder fields of struct dst_entry [DECNET]: Convert decnet route to use the new dst_entry 'next' pointer [IPV6]: Convert ipv6 route to use the new dst_entry 'next' pointer [IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer [NET]: Introduce union in struct dst_entry to hold 'next' pointer [DECNET]: fix misannotation of linkinfo_dn [DECNET]: FRA_{DST,SRC} are le16 for decnet [UDP]: UDP can use sk_hash to speedup lookups [NET]: Fix whitespace errors. [NET] XFRM: Fix whitespace errors. [NET] X25: Fix whitespace errors. [NET] WANROUTER: Fix whitespace errors. [NET] UNIX: Fix whitespace errors. [NET] TIPC: Fix whitespace errors. [NET] SUNRPC: Fix whitespace errors. [NET] SCTP: Fix whitespace errors. [NET] SCHED: Fix whitespace errors. [NET] RXRPC: Fix whitespace errors. ...
Showing
- include/net/dn_route.h 2 additions, 3 deletionsinclude/net/dn_route.h
- include/net/dst.h 10 additions, 5 deletionsinclude/net/dst.h
- include/net/ip6_fib.h 0 additions, 1 deletioninclude/net/ip6_fib.h
- include/net/route.h 3 additions, 4 deletionsinclude/net/route.h
- net/802/fc.c 12 additions, 12 deletionsnet/802/fc.c
- net/802/fddi.c 13 additions, 13 deletionsnet/802/fddi.c
- net/802/hippi.c 10 additions, 10 deletionsnet/802/hippi.c
- net/802/psnap.c 1 addition, 1 deletionnet/802/psnap.c
- net/802/tr.c 68 additions, 68 deletionsnet/802/tr.c
- net/8021q/vlan.c 26 additions, 26 deletionsnet/8021q/vlan.c
- net/8021q/vlan.h 6 additions, 6 deletionsnet/8021q/vlan.h
- net/8021q/vlan_dev.c 21 additions, 21 deletionsnet/8021q/vlan_dev.c
- net/8021q/vlanproc.c 18 additions, 18 deletionsnet/8021q/vlanproc.c
- net/appletalk/aarp.c 7 additions, 7 deletionsnet/appletalk/aarp.c
- net/appletalk/atalk_proc.c 1 addition, 1 deletionnet/appletalk/atalk_proc.c
- net/appletalk/ddp.c 109 additions, 109 deletionsnet/appletalk/ddp.c
- net/appletalk/dev.c 4 additions, 4 deletionsnet/appletalk/dev.c
- net/atm/atm_sysfs.c 7 additions, 7 deletionsnet/atm/atm_sysfs.c
- net/atm/br2684.c 2 additions, 2 deletionsnet/atm/br2684.c
- net/atm/common.c 17 additions, 17 deletionsnet/atm/common.c
Loading
Please register or sign in to comment