diff options
| author | Linus Torvalds | 2011-08-24 09:11:08 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2011-08-24 09:11:08 -0700 |
| commit | 2da2c664ecbaace283d0d8bd7b55a5a038cbbc80 (patch) | |
| tree | bdad3a5b2f64abb500e4b57152e91499fed08561 /drivers/char | |
| parent | 14c62e78dc1379185515be41903c4a667efc6d54 (diff) | |
| parent | 11f3a6bdc2528d1ce2af50202dbf7138fdee1b34 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (29 commits)
bridge: fix a possible net_device leak
net: Documentation: RFC 2553bis is now RFC 3493
atm: br2684: Fix oops due to skb->dev being NULL
ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS
net: netdev-features.txt update to Documentation/networking/00-INDEX
vlan: reset headers on accel emulation path
forcedeth: call vlan_mode only if hw supports vlans
via-velocity: remove non-tagged packet filtering
bonding:reset backup and inactive flag of slave
net_sched: fix port mirror/redirect stats reporting
sit tunnels: propagate IPv6 transport class to IPv4 Type of Service
gianfar: reduce stack usage in gianfar_ethtool.c
net: minor update to Documentation/networking/scaling.txt
net: add missing entries to Documentation/networking/00-INDEX
gianfar: prevent buggy hw rx vlan tagging
net: sh_eth: Fix build by forgot including linux/interrupt.h
drivers/net/can/sja1000/plx_pci.c: eliminate double free
usbnet/cdc_ncm: Don't use stack variables for DMA
vmxnet3: Don't enable vlan filters in promiscuous mode.
iwlagn: sysfs couldn't find the priv pointer
...
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions