1. 28 Sep, 2006 33 commits
  2. 27 Sep, 2006 7 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · a77c64c1
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (48 commits)
        [PATCH] bonding: update version number
        [PATCH] git-netdev-all: pc300_tty build fix
        [PATCH] Make PC300 WAN driver compile again
        [PATCH] Modularize generic HDLC
        [PATCH] more s2io __iomem annotations
        [PATCH] restore __iomem annotations in e1000
        [PATCH] 64bit bugs in s2io
        [PATCH] bonding: Fix primary selection error at enslavement time
        [PATCH] bonding: Don't mangle LACPDUs
        [PATCH] bonding: Validate probe replies in ARP monitor
        [PATCH] bonding: Don't release slaves when master is admin down
        [PATCH] bonding: Add priv_flag to avoid event mishandling
        [PATCH] bonding: Handle large hard_header_len
        [PATCH] bonding: Remove unneeded NULL test
        [PATCH] bonding: Format fix in seq_printf call
        [PATCH] bonding: Convert delay value from s16 to int
        [PATCH] bonding: Allow bonding to enslave a 10 Gig adapter
        Delete unused drivers/net/gt64240eth.h
        [PATCH] skge: fiber support
        [PATCH] fix possible NULL ptr deref in forcedeth
        ...
      a77c64c1
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · ac7f6b5e
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [libata] Don't use old-EH ->eng_timeout() hook when not needed
        [libata] sata_mv: fix oops by filling in missing hook
        [libata] One more s/15/ATA_SECONDARY_IRQ/ substitution
        [libata] pata_serverworks: fill in ->irq_clear hook
        [PATCH] pata_serverworks: correct PCI ID in cable detection table
        [PATCH] libata-sff: use our IRQ defines
        [PATCH] libata-eh: Remove layering violation and duplication when handling absent ports
        [PATCH] libata: tighten rules for legacy dependancies
        [PATCH] libata: refuse to register IRQless ports
      ac7f6b5e
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 1f9bd4c9
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (129 commits)
        [PATCH] USB Storage: fix Rio Karma eject support build error
        USB: Airprime driver improvements to allow full speed EvDO transfers
        USB: remove OTG build warning
        USB: EHCI update VIA workaround
        USB: force root hub resume after power loss
        USB: ohci_usb can oops on shutdown
        USB: Dealias -110 code (more complete)
        USB: Remove unneeded void * casts in core files
        USB: u132-hcd: host controller driver for ELAN U132 adapter
        USB: ftdi-elan: client driver for ELAN Uxxx adapters
        usb serial: support Alcor Micro Corp. USB 2.0 TO RS-232 through pl2303 driver
        USB: Moschip 7840 USB-Serial Driver
        USB: add PlayStation 2 Trance Vibrator driver
        USB: Add ADU support for Ontrak ADU devices
        aircable: fix printk format warnings
        Add AIRcable USB Bluetooth Dongle Driver
        cypress_m8: implement graceful failure handling
        cypress_m8: improve control endpoint error handling
        cypress_m8: use usb_fill_int_urb where appropriate
        cypress_m8: use appropriate URB polling interval
        ...
      1f9bd4c9
    • Andi Kleen's avatar
      [PATCH] i386: Use early clobbers for semaphores now · 00463c16
      Andi Kleen authored
      The new code does clobber the result early, so make sure to tell
      gcc to not put it into the same register as a input argument
      Signed-off-by: default avatarAndi Kleen <ak@suse.de>
      Cc: Andrew Morton <akpm@osdl.org>
      Acked-by: default avatarKyle McMartin <kyle@parisc-linux.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      00463c16
    • Jay Vosburgh's avatar
      [PATCH] bonding: update version number · 0ba8821b
      Jay Vosburgh authored
      	I neglected to properly update the version number in the recent
      patch series; this sets it to something reasonable.
      Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      0ba8821b
    • Andrew Morton's avatar
      [PATCH] git-netdev-all: pc300_tty build fix · fab2062e
      Andrew Morton authored
      In file included from drivers/net/wan/pc300_tty.c:59:
      drivers/net/wan/pc300.h:335: error: field 'pppdev' has incomplete type
      
      Cc: Krzysztof Halasa <khc@pm.waw.pl>
      Cc: Jeff Garzik <jeff@garzik.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
      fab2062e
    • Andrew Morton's avatar
      [PATCH] USB Storage: fix Rio Karma eject support build error · 7f38aa0f
      Andrew Morton authored
      In file included from drivers/usb/storage/usb.c:180:
      drivers/usb/storage/unusual_devs.h:221: error: 'US_PR_KARMA' undeclared here (not in a function)
      drivers/usb/storage/unusual_devs.h:221: error: 'rio_karma_init' undeclared here (not in a function)
      
      Cc: Keith Bennett <keith@mcs.st-and.ac.uk>
      Acked-by: default avatarBob Copeland <me@bobcopeland.com>
      Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      7f38aa0f