summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-185-4/+6
|\
| * of: fix missing headers for of_address_to_resource() in MTD and SysACE driversGraeme Smecher2010-08-172-0/+2
| * of: Fix missing includesGrant Likely2010-08-162-2/+2
| * ata: update for of_device to platform_device replacementStephen Rothwell2010-08-161-2/+2
* | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe...Linus Torvalds2010-08-171-4/+7
|\ \
| * | vt,console,kdb: preserve console_blanked while in kdbJason Wessel2010-08-161-0/+3
| * | vt: fix regression warnings from KMS mergeJason Wessel2010-08-161-4/+4
| |/
* | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg...Linus Torvalds2010-08-175-91/+117
|\ \
| * | platform/x86: move rfkill for Dell Mini 1012 to compal-laptopVictor van den Elzen2010-08-162-0/+16
| * | thinkpad-acpi: Add KEY_CAMERA (Fn-F6) for Lenovo keyboardsJens Taprogge2010-08-161-1/+1
| * | thinkpad-acpi: add support for model-specific keymapsHenrique de Moraes Holschuh2010-08-161-18/+42
| * | thinkpad-acpi: lock down size of hotkey keymapHenrique de Moraes Holschuh2010-08-161-4/+15
| * | thinkpad-acpi: untangle ACPI/vendor backlight selectionHenrique de Moraes Holschuh2010-08-161-22/+20
| * | thinkpad-acpi: find ACPI video device by synthetic HIDHenrique de Moraes Holschuh2010-08-161-40/+12
| * | intel_ips: potential null dereferenceDan Carpenter2010-08-161-1/+3
| * | drivers/platform/x86: Adjust confusing if indentationJulia Lawall2010-08-161-2/+4
| * | x86: intel_ips: do not use PCI resources before pci_enable_device()Kulikov Vasiliy2010-08-161-5/+6
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-08-1710-16/+48
|\ \
| * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-08-1610-16/+48
| |\ \
| | * | ath5k: disable ASPM L0s for all cardsMaxim Levitsky2010-08-131-0/+21
| | * | ath9k_htc: load proper firmware for device ID 7015Rajkumar Manoharan2010-08-135-7/+11
| | * | wl1251: fix trigger scan timeout usageYuri Kululin2010-08-131-1/+1
| | * | ath9k_htc: Fix disconnect issue in HT40 mode.Vivek Natarajan2010-08-131-1/+2
| | * | ath9k_htc: fix panic on packet injection using airbase-ng tool.Rajkumar Manoharan2010-08-111-5/+10
| | * | ipw2100: register pm_qos request before registering pci driverJohn W. Linville2010-08-111-2/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2010-08-171-6/+9
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...David S. Miller2010-08-161194-22433/+64897
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | sparc: Really fix "console=" for serial consoles.David S. Miller2010-08-161-6/+9
* | | | | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-08-171-2/+8
|\ \ \ \ \
| * | | | | VIDEO: amba clcd: don't disable an already disabled clockRussell King2010-08-171-2/+8
* | | | | | arcmsr_hba: Missing slab.h includeDavid Miller2010-08-171-0/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2010-08-1535-1471/+1062
|\ \ \ \ \
| * | | | | Merge branch 'linus' into releaseLen Brown2010-08-153584-144539/+305713
| |\| | | |
| * | | | | gcc-4.6: ACPI: fix unused but set variables in ACPIAndi Kleen2010-08-157-26/+11
| * | | | | ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFSZhang Rui2010-08-152-33/+54
| * | | | | ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFSZhang Rui2010-08-152-50/+82
| * | | | | ACPI processor: remove deprecated ACPI procfs I/FZhang Rui2010-08-155-272/+0
| * | | | | ACPI power_resource: remove unused procfs I/FZhang Rui2010-08-151-127/+1
| * | | | | ACPI: remove deprecated ACPI procfs I/FZhang Rui2010-08-157-484/+1
| * | | | | ACPI: introduce drivers/acpi/sysfs.cZhang Rui2010-08-156-571/+688
| * | | | | Merge branch 'acpica-gpe' into releaseLen Brown2010-08-1550-919/+513
| |\ \ \ \ \
| | * | | | | ACPI / ACPICA: Fix reference counting problems with GPE handlersRafael J. Wysocki2010-08-075-78/+139
| * | | | | | Merge branch 'bugzilla-16422' into releaseLen Brown2010-08-141-1/+2
| |\ \ \ \ \ \
| | * | | | | | ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI deviceZhao Yakui2010-07-261-1/+2
| * | | | | | | Merge branch 'procfs-cleanup' into releaseLen Brown2010-08-146-76/+102
| |\ \ \ \ \ \ \
| | * | | | | | | ACPI: introduce module parameter acpi.aml_debug_outputZhang Rui2010-08-142-1/+9
| | * | | | | | | ACPI: introduce drivers/acpi/debugfs.cZhang Rui2010-08-145-75/+93
| * | | | | | | | Merge branch 'apei' into releaseLen Brown2010-08-146-89/+380
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ACPI, APEI, ERST debug supportHuang Ying2010-08-143-0/+217
| | * | | | | | | | ACPI, APEI, Manage GHES as platform devicesHuang Ying2010-08-082-71/+145