summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/...Linus Torvalds2006-10-1811-16/+82
|\
| * [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.Ben Collins2006-10-181-2/+2
| * [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled.Ben Collins2006-10-181-1/+4
| * [igafb] Add pci dev table for module auto loading.Ben Collins2006-10-181-0/+7
| * [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled.Ben Collins2006-10-181-2/+6
| * [hid-core] TurboX Keyboard needs NOGET quirk.Ben Collins2006-10-181-0/+5
| * [ixj] Add pci dev table for module auto loading.Ben Collins2006-10-181-1/+10
| * [initio] Add pci dev table for module auto loading.Ben Collins2006-10-181-9/+10
| * [fdomain] Add pci dev table for module auto loading.Ben Collins2006-10-181-0/+9
| * [BusLogic] Add pci dev table for auto module loading.Ben Collins2006-10-181-0/+11
| * [mv643xx] Add pci device table for auto module loading.Ben Collins2006-10-181-0/+6
| * [alim7101] Add pci dev table for auto module loading.Ben Collins2006-10-181-1/+12
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6Linus Torvalds2006-10-188-63/+102
|\ \
| * | hwmon: Fix debug messages in w83781dJean Delvare2006-10-181-8/+10
| * | hwmon: Let w83781d and lm78 load againJean Delvare2006-10-183-13/+13
| * | w83627ehf: Fix the detection of fan5Rudolf Marek2006-10-181-2/+9
| * | k8temp: Documentation updateRudolf Marek2006-10-181-2/+4
| * | smsc47m1: List the SMSC LPC47M112 as supportedJean Delvare2006-10-182-7/+8
| * | adm9240: Update Grant Coady's email addressGrant Coady2006-10-181-2/+2
| * | w83791d: Fix unchecked return statusJim Cromie2006-10-181-29/+56
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/aoe-2.6Linus Torvalds2006-10-187-179/+287
|\ \ \
| * | | aoe: fix sysfs_create_file warningsGreg Kroah-Hartman2006-10-181-9/+14
| * | | aoe: revert printk macrosEd L. Cashin2006-10-187-37/+39
| * | | aoe: update driver versionEd L. Cashin2006-10-181-1/+1
| * | | aoe: remove sysfs commentEd L. Cashin2006-10-181-1/+0
| * | | aoe: use bio->bi_idxEd L. Cashin2006-10-182-1/+3
| * | | aoe: module parameter for device timeoutEd L. Cashin2006-10-181-2/+5
| * | | aoe: zero copy write 2 of 2Ed L. Cashin2006-10-183-20/+64
| * | | aoe: improve retransmission heuristicsEd L. Cashin2006-10-182-6/+17
| * | | aoe: jumbo frame support 2 of 2Ed L. Cashin2006-10-181-2/+6
| * | | aoe: clean up printks via macrosEd L. Cashin2006-10-187-58/+50
| * | | aoe: jumbo frame support 1 of 2Ed L. Cashin2006-10-183-17/+72
| * | | aoe: zero copy write 1 of 2Ed L. Cashin2006-10-183-74/+69
| * | | aoe: remove unused NARGS enumEd L. Cashin2006-10-181-1/+0
| * | | aoe: update copyright dateEd L. Cashin2006-10-187-7/+7
| * | | aoe: eliminate isbusy messageEd L. Cashin2006-10-181-4/+1
| |/ /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6Linus Torvalds2006-10-1837-387/+447
|\ \ \
| * | | PCI Hotplug: move pci_hotplug.h to include/linux/Greg Kroah-Hartman2006-10-1823-257/+22
| * | | change pci hotplug subsystem maintainer to KristenKristen Carlson Accardi2006-10-182-4/+2
| * | | PCI: optionally sort device lists breadth-firstMatt Domsch2006-10-181-0/+92
| * | | cpcihp_generic: prevent loading without "bridge" parameterAkinobu Mita2006-10-181-2/+2
| * | | pci: Additional search functionsAlan Cox2006-10-181-2/+70
| * | | PCI: quirks: switch quirks code offender to use pci_get APIAlan Cox2006-10-181-1/+2
| * | | PCI: Improve pci_msi_supported() commentsBrice Goglin2006-10-181-7/+9
| * | | PCI hotplug: ioremap balanced with iounmapAmol Lad2006-10-181-5/+14
| * | | shpchp: remove unnecessary cmd_busy member from struct controllerKenji Kaneshige2006-10-182-5/+1
| * | | shpchp: fix command completion checkKenji Kaneshige2006-10-181-5/+9
| * | | pci: Stamp out pci_find_* usage in fakephpAlan Cox2006-10-181-3/+8
| * | | PCI: fix pcie_portdrv_restore_config undefined without CONFIG_PM errorZhang, Yanmin2006-10-181-1/+1
| * | | Fix DMA resource allocation in ACPIPnPVojtech Pavlik2006-10-181-15/+26