1. 11 Mar, 2011 1 commit
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 78f9bbb5
      Linus Torvalds authored
      * 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 8909c9ad ("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.
      78f9bbb5
  2. 10 Mar, 2011 26 commits
  3. 09 Mar, 2011 13 commits