1. 15 9月, 2010 11 次提交
  2. 14 9月, 2010 11 次提交
  3. 13 9月, 2010 10 次提交
  4. 12 9月, 2010 6 次提交
  5. 11 9月, 2010 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · 002e473d
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (28 commits)
        ipheth: remove incorrect devtype to WWAN
        MAINTAINERS: Add CAIF
        sctp: fix test for end of loop
        KS8851: Correct RX packet allocation
        udp: add rehash on connect()
        net: blackhole route should always be recalculated
        ipv4: Suppress lockdep-RCU false positive in FIB trie (3)
        niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL
        ipvs: fix active FTP
        gro: Re-fix different skb headrooms
        via-velocity: Turn scatter-gather support back off.
        ipv4: Fix reverse path filtering with multipath routing.
        UNIX: Do not loop forever at unix_autobind().
        PATCH: b44 Handle RX FIFO overflow better (simplified)
        irda: off by one
        3c59x: Fix deadlock in vortex_error()
        netfilter: discard overlapping IPv6 fragment
        ipv6: discard overlapping fragment
        net: fix tx queue selection for bridged devices implementing select_queue
        bonding: Fix jiffies overflow problems (again)
        ...
      
      Fix up trivial conflicts due to the same cgroup API thinko fix going
      through both Andrew and the networking tree.  However, there were small
      differences between the two, with Andrew's version generally being the
      nicer one, and the one I merged first. So pick that one.
      
      Conflicts in: include/linux/cgroup.h and kernel/cgroup.c
      002e473d
    • L