1. 20 Oct, 2006 37 commits
  2. 19 Oct, 2006 3 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.
      ce9e3d99
    • 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
      64d9a39e
    • 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
      17e6c600