diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-11 01:30:21 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-11 01:30:21 +0100 |
| commit | 78f9bbb5a6f41fcb7934848c7821b99718f7e338 (patch) | |
| tree | 2336bc7a354eecbcccb36f239637847740a4ae7a /mm | |
| parent | Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/m... (diff) | |
| parent | ariadne: remove redundant NULL check (diff) | |
| download | linux-78f9bbb5a6f41fcb7934848c7821b99718f7e338.tar.xz linux-78f9bbb5a6f41fcb7934848c7821b99718f7e338.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ariadne: remove redundant NULL check
ip6ip6: autoload ip6 tunnel
net: bridge builtin vs. ipv6 modular
ipv6: Don't create clones of host routes.
pktgen: fix errata in show results
ipv4: Fix erroneous uses of ifa_address.
vxge: update MAINTAINERS
r6040: bump to version 0.27 and date 23Feb2011
r6040: fix multicast operations
rds: prevent BUG_ON triggering on congestion map updates
bonding 802.3ad: Rename rx_machine_lock to state_machine_lock
bonding 802.3ad: Fix the state machine locking v2
drivers/net/macvtap: fix error check
net: fix multithreaded signal handling in unix recv routines
net: Enter net/ipv6/ even if CONFIG_IPV6=n
net/smsc911x.c: Set the VLAN1 register to fix VLAN MTU problem
bnx2x: fix MaxBW configuration
bnx2x: (NPAR) prevent HW access in D3 state
bnx2x: fix link notification
bnx2x: fix non-pmf device load flow
Doing my first --no-ff merge here, to get the explicit merge commit.
David did a back-merge in order to get commit 8909c9ad8ff0 ("net: don't
allow CAP_NET_ADMIN to load non-netdev kernel modules") so that we can
add Stephen Hemminger's fix to handle ip6 tunnels as well, which uses
the MODULE_ALIAS_NETDEV() macro created by that change.
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions