summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-19 03:30:00 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-19 03:30:00 +0200
commitce9e3d9953c8cb67001719b5516da2928e956be4 (patch)
tree77b56ec0815b4381b03418baaf88d092082e2c04 /crypto
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6 (diff)
parent[pci_ids] Add Quicknet XJ vendor/device ID's. (diff)
downloadlinux-ce9e3d9953c8cb67001719b5516da2928e956be4.tar.xz
linux-ce9e3d9953c8cb67001719b5516da2928e956be4.zip
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.
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions