1. 01 Jul, 2006 35 commits
  2. 30 Jun, 2006 5 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 9262e914
      Linus Torvalds authored
      * 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().
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · e37a72de
      Linus Torvalds authored
      * 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
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 93fdf10d
      Linus Torvalds authored
      * '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
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 22a3e233
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
        Remove obsolete #include <linux/config.h>
        remove obsolete swsusp_encrypt
        arch/arm26/Kconfig typos
        Documentation/IPMI typos
        Kconfig: Typos in net/sched/Kconfig
        v9fs: do not include linux/version.h
        Documentation/DocBook/mtdnand.tmpl: typo fixes
        typo fixes: specfic -> specific
        typo fixes in Documentation/networking/pktgen.txt
        typo fixes: occuring -> occurring
        typo fixes: infomation -> information
        typo fixes: disadvantadge -> disadvantage
        typo fixes: aquire -> acquire
        typo fixes: mecanism -> mechanism
        typo fixes: bandwith -> bandwidth
        fix a typo in the RTC_CLASS help text
        smb is no longer maintained
      Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/ · 39302175
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/:
        [PATCH] pcmcia: fix deadlock in pcmcia_parse_events
        [PATCH] com20020_cs: more device support
        [PATCH] au1xxx: pcmcia: fix __init called from non-init
        [PATCH] kill open-coded offsetof in cm4000_cs.c ZERO_DEV()
        [PATCH] pcmcia: convert pcmcia_cs to kthread
        [PATCH] pcmcia: fix kernel-doc function name
        [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs
        [PATCH] pcmcia: at91_cf suspend/resume/wakeup
        [PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available
        [PATCH] pcmcia: TI PCIxx12 CardBus controller support
        [PATCH] pcmcia: warn if driver requests exclusive, but gets a shared IRQ
        [PATCH] pcmcia: expose tool in pcmcia/Documentation/pcmcia/
        [PATCH] pcmcia: another ID for serial_cs.c
        [PATCH] yenta: fix hidden PCI bus numbers
        [PATCH] yenta: do power-up only after socket is configured