1. 20 Oct, 2006 31 commits
  2. 19 Oct, 2006 7 commits
    • Linus Torvalds's avatar
      Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6 · ce9e3d99
      Linus Torvalds authored
      * 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6:
        [pci_ids] Add Quicknet XJ vendor/device ID's.
        [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.
        [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled.
        [igafb] Add pci dev table for module auto loading.
        [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled.
        [hid-core] TurboX Keyboard needs NOGET quirk.
        [ixj] Add pci dev table for module auto loading.
        [initio] Add pci dev table for module auto loading.
        [fdomain] Add pci dev table for module auto loading.
        [BusLogic] Add pci dev table for auto module loading.
        [mv643xx] Add pci device table for auto module loading.
        [alim7101] Add pci dev table for auto module loading.
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6 · 64d9a39e
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6:
        hwmon: Fix debug messages in w83781d
        hwmon: Let w83781d and lm78 load again
        w83627ehf: Fix the detection of fan5
        k8temp: Documentation update
        smsc47m1: List the SMSC LPC47M112 as supported
        hwmon: Fix documentation typos
        adm9240: Update Grant Coady's email address
        w83791d: Fix unchecked return status
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6 · 17e6c600
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6:
        aoe: fix sysfs_create_file warnings
        aoe: revert printk macros
        aoe: update driver version
        aoe: remove sysfs comment
        aoe: use bio->bi_idx
        aoe: module parameter for device timeout
        aoe: zero copy write 2 of 2
        aoe: improve retransmission heuristics
        aoe: jumbo frame support 2 of 2
        aoe: clean up printks via macros
        aoe: jumbo frame support 1 of 2
        aoe: zero copy write 1 of 2
        aoe: remove unused NARGS enum
        aoe: update copyright date
        aoe: eliminate isbusy message
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6 · b6aefcce
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6: (22 commits)
        PCI Hotplug: move pci_hotplug.h to include/linux/
        change pci hotplug subsystem maintainer to Kristen
        PCI: optionally sort device lists breadth-first
        cpcihp_generic: prevent loading without "bridge" parameter
        pci: Additional search functions
        PCI: quirks: switch quirks code offender to use pci_get API
        PCI: Update MSI-HOWTO.txt according to pci_msi_supported()
        PCI: Improve pci_msi_supported() comments
        PCI hotplug: ioremap balanced with iounmap
        shpchp: remove unnecessary cmd_busy member from struct controller
        shpchp: fix command completion check
        pci: Stamp out pci_find_* usage in fakephp
        PCI: fix pcie_portdrv_restore_config undefined without CONFIG_PM error
        Fix DMA resource allocation in ACPIPnP
        PCI: Turn pci_fixup_video into generic for embedded VGA
        PCI: add ICH7/8 ACPI/GPIO io resource quirks
        PCI: pcie-check-and-return-bus_register-errors fix
        PCI: VIA IRQ quirk behaviour change
        pciehp: Remove unnecessary check in pciehp_ctrl.c
        pciehp - add missing locking
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 65740356
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        driver core: kmalloc() failure check in driver_probe_device
        Driver core: bus: remove indentation level
        Driver core: Don't ignore error returns from probing
        Driver core: Don't leak 'old_class_name' in drivers/base/core.c::device_rename()
        driver core fixes: sysfs_create_group() retval in topology.c
        driver core fixes: device_create_file() retval check in dmapool.c
        driver core fixes: device_add() cleanup on error
        driver core fixes: bus_add_device() cleanup on error
        driver core fixes: bus_add_attrs() retval check
        driver core fixes: sysfs_create_link() retval check in class.c
        sysfs: update obsolete comment in sysfs_update_file
        sysfs: remove duplicated dput in sysfs_update_file
        HOWTO: bug report addition
        Fix dev_printk() is now GPL-only
        Driver core: plug device probe memory leak
        Documentation: feature-removal-schedule typo
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 6a13a857
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] update default configuration
        [S390] cio: update documentation.
        [S390] dasd: clean up timer.
        [S390] Fix pte type checking.
        [S390] monwriter find header logic.
        [S390] cio: sch_no -> schid.sch_no conversion.
        [S390] Wire up epoll_pwait syscall.
        [S390] cio: invalid device operational notification
        [S390] fix vmlinux link when CONFIG_SYSIPC=n
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 · 3bee9df0
      Linus Torvalds authored
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
        [IA64] Count resched interrupts
        [IA64] remove unused acpi_kbd_controller_present, acpi_legacy_devices
        [IA64] update sn2_defconfig
        [IA64] reformat pal.S to fit in 80 columns, fix typos
        [IA64] remove unused PAL_CALL_IC_OFF
        [IA64] - Allow IPIs in timer loop
        [IA64] move ioremap/ioremap_nocache under __KERNEL__
        [IA64] perfmon fix for global IRQ fix
  3. 18 Oct, 2006 2 commits