1. 02 7月, 2006 37 次提交
  2. 01 7月, 2006 3 次提交
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 9262e914
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SPARC64]: Kill sun4v virtual device layer.
        [SERIAL] sunhv: Convert to of_driver layer.
        [SPARC64]: Mask out top 8-bits in physical address when building resources.
        [SERIAL] sunsu: Missing return statement in su_probe().
      9262e914
    • L
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · e37a72de
      Linus Torvalds 提交于
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [IPV6]: Added GSO support for TCPv6
        [NET]: Generalise TSO-specific bits from skb_setup_caps
        [IPV6]: Added GSO support for TCPv6
        [IPV6]: Remove redundant length check on input
        [NETFILTER]: SCTP conntrack: fix crash triggered by packet without chunks
        [TG3]: Update version and reldate
        [TG3]: Add TSO workaround using GSO
        [TG3]: Turn on hw fix for ASF problems
        [TG3]: Add rx BD workaround
        [TG3]: Add tg3_netif_stop() in vlan functions
        [TCP]: Reset gso_segs if packet is dodgy
      e37a72de
    • L
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 93fdf10d
      Linus Torvalds 提交于
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Set alternate port number when initializing QP attributes
        IB/uverbs: Set correct user handle for user SRQs
      93fdf10d