diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-09 18:38:59 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-09 18:38:59 +0100 |
| commit | 99b48cff405333afe26ac603b37639c410a48e5d (patch) | |
| tree | 31b427930317b1596ca6070585f66a108b722580 /drivers/net/7990.c | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| parent | [NETLINK]: Put {IFA,IFLA}_{RTA,PAYLOAD} macros back for userspace. (diff) | |
| download | linux-99b48cff405333afe26ac603b37639c410a48e5d.tar.xz linux-99b48cff405333afe26ac603b37639c410a48e5d.zip | |
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:
[NETLINK]: Put {IFA,IFLA}_{RTA,PAYLOAD} macros back for userspace.
[NET_SCHED] sch_htb: turn intermediate classes into leaves
[NET_SCHED] sch_cbq: deactivating when grafting, purging etc.
[XFRM]: Fix XFRMGRP_REPORT to use correct multicast group.
[NET]: Force a cache line split in hh_cache in SMP.
[NETPOLL]: make arp replies through netpoll use mac address of sender
[NETLINK]: Restore API compatibility of address and neighbour bits
[AX.25]: Fix default address and broadcast address initialization.
[AX.25]: Constify ax25 utility functions
[BNX2]: Add an error check.
[NET]: Convert hh_lock to seqlock.
Diffstat (limited to 'drivers/net/7990.c')
0 files changed, 0 insertions, 0 deletions