1. 01 Jul, 2006 32 commits
  2. 30 Jun, 2006 8 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().
      9262e914
    • 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
      e37a72de
    • 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
      93fdf10d
    • 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
      22a3e233
    • 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
      39302175
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb · 1cfef5ed
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
        V4L/DVB (4290): Add support for the TCL M2523_3DB_E tuner.
        V4L/DVB (4289): Missing statement in drivers/media/dvb/frontends/cx22700.c
        V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2
        V4L/DVB (4287): Pvrusb2/: possible cleanups
        V4L/DVB (4285): Cx88: add support for Geniatech Digistar / Digiwave 103g
        V4L/DVB (4284): Cx24123: fix set_voltage function according to the specs
        V4L/DVB (4282): Fix: use swzigzag for swalgo
        V4L/DVB (4281): TDA9887_SET_CONFIG should only be handled by the tda9887.
        V4L/DVB (4277): Fix CI interface on PRO KNC1 cards
        V4L/DVB (4276): Fix CI on old KNC1 DVBC cards
        V4L/DVB (4275): The FE_SET_FRONTEND_TUNE_MODE ioctl always returns EOPNOTSUPP
        V4L/DVB (4274): Eliminate use of tda9887 from pvrusb2 driver
        V4L/DVB (4273): Always log pvrusb2 device register / unregister events
        V4L/DVB (4272): Fix tveeprom supported standards
        V4L/DVB (4270): Add tda9887-specific tuner configuration
        V4L/DVB (4269): Subject: videocodec: make 1-bit fields unsigned
        V4L/DVB (4267): Remove all instances of request_module("tda9887")
        V4L/DVB (4264): Cx88-blackbird: implement VIDIOC_QUERYCTRL and VIDIOC_QUERYMENU
      1cfef5ed
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 3e8d6ad9
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (25 commits)
        ACPI: Kconfig: ACPI_SRAT depends on ACPI
        ACPI: drivers/acpi/scan.c: make acpi_bus_type static
        ACPI: fixup memhotplug debug message
        ACPI: ACPICA 20060623
        ACPI: C-States: only demote on current bus mastering activity
        ACPI: C-States: bm_activity improvements
        ACPI: C-States: accounting of sleep states
        ACPI: additional blacklist entry for ThinkPad R40e
        ACPI: restore comment justifying 'extra' P_LVLx access
        ACPI: fix battery on HP NX6125
        ACPIPHP: prevent duplicate slot numbers when no _SUN
        ACPI: static-ize handle_hotplug_event_func()
        ACPIPHP: use ACPI dock driver
        ACPI: dock driver
        KEVENT: add new uevent for dock
        ACPI: asus_acpi_init: propagate correct return value
        [ACPI] Print error message if remove/install notify handler fails
        ACPI: delete tracing macros from drivers/acpi/*.c
        ACPI: HW P-state coordination support
        ACPI: un-export ACPI_ERROR() -- use printk(KERN_ERR...)
        ...
      3e8d6ad9
    • David S. Miller's avatar
      [SPARC64]: Kill sun4v virtual device layer. · 6e990b50
      David S. Miller authored
      
      
      Replace with a simple IRQ translater in the PROM
      device tree builder.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      6e990b50