1. 21 10月, 2006 38 次提交
  2. 19 10月, 2006 2 次提交
    • L
      Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6 · ce9e3d99
      Linus Torvalds 提交于
      * '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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6 · 64d9a39e
      Linus Torvalds 提交于
      * 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