1. 02 Dec, 2006 14 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc · cdb54fac
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/drzeus/mmc:
        mmc: correct request error handling
        mmc: Flush block queue when removing card
        mmc: sdhci high speed support
        mmc: Support for high speed SD cards
        mmc: Fix mmc_delay() function
        mmc: Add support for mmc v4 wide-bus modes
        [PATCH] mmc: Add support for mmc v4 high speed mode
        trivial change for mmc/Kconfig: MMC_PXA does not mean only PXA255
        Make general code cleanups
        Add MMC_CAP_{MULTIWRITE,BYTEBLOCK} flags
        Platform device error handling cleanup
        Move register definitions away from the header file
        Change OMAP_MMC_{READ,WRITE} macros to use the host pointer
        Replace base with virt_base and phys_base
        mmc: constify mmc_host_ops vectors
        mmc: remove kernel_thread()
      cdb54fac
    • Linus Torvalds's avatar
      Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · 37043318
      Linus Torvalds authored
      * 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
        Revert "ACPI: SCI interrupt source override"
      37043318
    • Len Brown's avatar
      Revert "ACPI: SCI interrupt source override" · 7bdd21ce
      Len Brown authored
      This reverts commit 281ea49b,
      which broke ACPI Interrupt source overrides that move
      the SCI from one IRQ in PIC mode to another in IOAPIC mode.
      
      If the SCI shared an interrupt line with another device,
      this would result in a "irq 18: nobody cared" type failure.
      
      http://bugzilla.kernel.org/show_bug.cgi?id=7601Signed-off-by: default avatarLen Brown <len.brown@intel.com>
      7bdd21ce
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 116b23b0
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        [PATCH] Fix an offset error when reading the CS89x0 ADD_PORT register
        [PATCH] spidernet: poor network performance
        [PATCH] Spidernet: remove ETH_ZLEN check in earlier patch
        [PATCH] bonding: fix an oops when slave device does not provide get_stats
        [PATCH] drivers/net: SAA9730: Fix build error
        Revert "[PATCH] zd1211rw: Removed unneeded packed attributes"
        [PATCH] zd1211rw: Fix of a locking bug
        [PATCH] softmac: remove netif_tx_disable when scanning
        [PATCH] ieee80211: Fix kernel panic when QoS is enabled
      116b23b0
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · b6ef977b
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
        [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 4
        [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 3
        [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 2
        [WATCHDOG] MIPS RM9000 on-chip watchdog device - patch 1
        [WATCHDOG] MIPS RM9000 on-chip watchdog device
        [WATCHDOG] Add iTCO vendor specific support
        [WATCHDOG] sc1200wdt.c pnp unregister fix.
        [WATCHDOG] config.h removal
        [WATCHDOG] NS pc87413-wdt Watchdog driver - fixes
        [WATCHDOG] NS pc87413-wdt Watchdog driver v1.1
        [WATCHDOG] NS pc87413-wdt Watchdog driver
      b6ef977b
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev · 9ba5aa31
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        [PATCH] libata: add missing sht->slave_destroy
        [PATCH] ahci: ignore PORT_IRQ_IF_ERR on JMB controllers
      9ba5aa31
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · c3e59d1e
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (31 commits)
        [MIPS] Remove duplicate ISA DMA code for 0 DMA channel case.
        [MIPS] Remove unused definition of cpu_to_lelongp()
        [MIPS] Remove userspace proofing from <asm/bitops.h>.
        [MIPS] Remove old junk left from old atomic_lock.
        [MIPS] Use conditional traps for BUG_ON on MIPS II and better.
        [MIPS] mips HPT cleanup: make clocksource_mips public
        [MIPS] do_IRQ cleanup
        [MIPS] Avoid dupliate D-cache flush on R400C / R4400 SC and MC variants.
        [MIPS] Remove redundant r4k_blast_icache() calls
        [MIPS] Work around bogus gcc warnings.
        [MIPS] Fix double inclusions
        [MIPS] use generic_handle_irq, handle_level_irq, handle_percpu_irq
        [MIPS] IRQ cleanups
        [MIPS] mips hpt cleanup: get rid of mips_hpt_init
        [MIPS] PB1200: Remove duplicate definitions
        [MIPS] Fix alignment hole in struct cache_desc; shrink struct.
        [MIPS] Oprofile: kernel support for the R10000.
        [MIPS] Remove unused R10000 performance counter definitions.
        [MIPS] Add support for kexec
        [MIPS] Don't print presence of WAIT instruction on bootup.
        ...
      c3e59d1e
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 · b07e3c3a
      Linus Torvalds authored
      * 'for-2.6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
        SELinux: validate kernel object classes and permissions
        SELinux: ensure keys constant in hashtab_search
        SELinux: export object class and permission definitions
        SELinux: remove current object class and permission validation mechanism
      b07e3c3a
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 5f56bbdf
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (25 commits)
        IB/ucm: Fix deadlock in cleanup
        IB/cm: Fix automatic path migration support
        IPoIB: Fix skb leak when freeing neighbour
        IB/srp: Fix memory leak on reconnect
        RDMA/addr: list_move() cleanups
        RDMA/addr: Fix some cancellation problems in process_req()
        RDMA/amso1100: Prevent deadlock in destroy QP
        IB/mthca: Fix initial SRQ logsize for mem-free HCAs
        IB/ehca: Use WQE offset instead of WQE addr for pending work reqs
        RDMA/iwcm: Fix comment for iwcm_deref_id() to match code
        RDMA/iwcm: Remove unnecessary function argument
        RDMA/iwcm: Remove unnecessary initializations
        RDMA/iwcm: Fix memory leak
        RDMA/iwcm: Fix memory corruption bug in cm_work_handler()
        IB: Convert kmem_cache_t -> struct kmem_cache
        IB/ipath: Fix typo in pma_counter_select subscript
        RDMA/amso1100: Fix section mismatches
        IB/mthca: Fix section mismatches
        IB/srp: Increase supported CDB size
        RDMA/cm: Remove setting local write as part of QP access flags
        ...
      5f56bbdf
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 96412198
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (103 commits)
        usbcore: remove unused argument in autosuspend
        USB: keep count of unsuspended children
        USB hub: simplify remote-wakeup handling
        USB: struct usb_device: change flag to bitflag
        OHCI: make autostop conditional on CONFIG_PM
        USB: Add autosuspend support to the hub driver
        EHCI: Fix root-hub and port suspend/resume problems
        USB: create a new thread for every USB device found during the probe sequence
        USB: add driver for the USB debug devices
        USB: added dynamic major number for USB endpoints
        USB: pegasus error path not resetting task's state
        USB: endianness fix for asix.c
        USB: build the appledisplay driver
        USB serial: replace kmalloc+memset with kzalloc
        USB: hid-core: canonical defines for Apple USB device IDs
        USB: idmouse cleanup
        USB: make drivers/usb/core/driver.c:usb_device_match() static
        USB: lh7a40x_udc remove double declaration
        USB: pxa2xx_udc recognizes ixp425 rev b0 chip
        usbtouchscreen: add support for DMC TSC-10/25 devices
        ...
      96412198
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 72a73a69
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (28 commits)
        PCI: make arch/i386/pci/common.c:pci_bf_sort static
        PCI: ibmphp_pci.c: fix NULL dereference
        pciehp: remove unnecessary pci_disable_msi
        pciehp: remove unnecessary free_irq
        PCI: rpaphp: change device tree examination
        PCI: Change memory allocation for acpiphp slots
        i2c-i801: SMBus patch for Intel ICH9
        PCI: irq: irq and pci_ids patch for Intel ICH9
        PCI: pci_{enable,disable}_device() nestable ports
        PCI: switch pci_{enable,disable}_device() to be nestable
        PCI: arch/i386/kernel/pci-dma.c: ioremap balanced with iounmap
        pci/i386: style cleanups
        PCI: Block on access to temporarily unavailable pci device
        pci: fix __pci_register_driver error handling
        pci: clear osc support flags if no _OSC method
        acpiphp: fix missing acpiphp_glue_exit()
        acpiphp: fix use of list_for_each macro
        Altix: Initial ACPI support - ROM shadowing.
        Altix: SN ACPI hotplug support.
        Altix: Add initial ACPI IO support
        ...
      72a73a69
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 4549df89
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
        Driver core: show drivers in /sys/module/
        Documentation/driver-model/platform.txt update/rewrite
        Driver core: platform_driver_probe(), can save codespace
        driver core: Use klist_remove() in device_move()
        driver core: Introduce device_move(): move a device to a new parent.
        Driver core: make drivers/base/core.c:setup_parent() static
        driver core: Introduce device_find_child().
        sysfs: sysfs_write_file() writes zero terminated data
        cpu topology: consider sysfs_create_group return value
        Driver core: Call platform_notify_remove later
        ACPI: Change ACPI to use dev_archdata instead of firmware_data
        Driver core: add dev_archdata to struct device
        Driver core: convert sound core to use struct device
        Driver core: change mem class_devices to be real devices
        Driver core: convert fb code to use struct device
        Driver core: convert firmware code to use struct device
        Driver core: convert mmc code to use struct device
        Driver core: convert ppdev code to use struct device
        Driver core: convert PPP code to use struct device
        Driver core: convert cpuid code to use struct device
        ...
      4549df89
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 6b8cc71a
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        [CIFS] Fix timezone handling on stat to os/2
        [CIFS] Incorrect hardlink count when original file is cached (oplocked)
      6b8cc71a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial · 1399ff54
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
        Fix typos in drivers/isdn/hisax/isdnl2.c
        Fix typos in doc and comments
        BUG_ON conversion for fs/aio.c
        BUG_ON conversion for drivers/mmc/omap.c
        BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
        Fix misc .c/.h comment typos
        Fix misc Kconfig typos
        Fix typos in /Documentation : Misc
        Fix typos in /Documentation : 'U-Z'
        Fix typos in /Documentation : 'T''
        Fix jiffies.h comment
        tabify MAINTAINERS
        fix spelling error in include/linux/kernel.h
        mqueue.h: don't include linux/types.h
      1399ff54
  2. 01 Dec, 2006 26 commits