1. 20 Oct, 2006 39 commits
  2. 19 Oct, 2006 1 commit
    • 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