Linus Torvalds ce9e3d9953 Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6
* '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.
2006-10-18 18:30:00 -07:00
..
2006-09-12 17:12:31 -05:00
2006-09-12 17:12:31 -05:00
2006-06-30 19:25:36 +02:00
2006-10-10 15:37:24 -07:00
2006-08-06 15:59:26 -05:00
2006-08-06 15:59:26 -05:00
2006-09-12 17:12:31 -05:00
2006-08-31 11:18:03 -04:00
2006-09-23 15:33:43 -05:00
2006-09-23 15:33:43 -05:00
2006-10-04 13:34:04 -05:00
2006-09-12 17:12:31 -05:00
2006-09-23 17:37:44 -05:00
2006-08-06 15:59:26 -05:00
2006-09-26 09:23:15 -07:00
2006-06-29 11:06:30 -04:00