summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2011-11-077-76/+233
|\
| *---. Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into nextLen Brown2011-11-062-61/+210
| |\ \ \
| | * | | cpuidle: Single/Global registration of idle statesDeepthi Dharwar2011-11-062-42/+169
| | * | | cpuidle: Split cpuidle_state structure and move per-cpu statistics fieldsDeepthi Dharwar2011-11-061-13/+12
| | * | | cpuidle: Move dev->last_residency update to driver enter routine; remove dev-...Deepthi Dharwar2011-11-061-26/+49
| | |/ /
| | | |
| | \ \
| | \ \
| | \ \
| | \ \
| | \ \
| *-----. | | Merge branches 'atomic-io', 'lockdep', 'misc', 'pm-profile' and 'pnp-cleanup'...Len Brown2011-11-064-14/+22
| |\ \ \ \| |
| | | | * | | ACPI: Export FADT pm_profile integer value to userspaceThomas Renninger2011-11-061-1/+13
| | | | |/ /
| | | * | | ACPI: Drop ACPI_NO_HARDWARE_INITRafael J. Wysocki2011-11-061-6/+2
| | | * | | ACPI: use kstrdup()Thomas Meyer2011-11-061-2/+1
| | | |/ /
| | * / / ACPI: Fix possible recursive locking in hwregs.cRakib Mullick2011-11-061-5/+6
| | |/ /
| * / / ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()Luck, Tony2011-11-061-1/+1
| |/ /
* | | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-0627-2/+26
|\ \ \
| * | | acpi: add export.h to files using THIS_MODULE/EXPORT_SYMBOLPaul Gortmaker2011-10-3122-0/+22
| * | | acpi: downgrade files from module.h to export.h where possible.Paul Gortmaker2011-10-311-1/+1
| * | | acpi: delete module.h include from files explicitly not needing itPaul Gortmaker2011-10-311-1/+0
| * | | acpi: add module.h to files implicitly using/relying on it.Paul Gortmaker2011-10-313-0/+3
* | | | ACPI / PM: Add Sony VPCEB17FX to nonvs blacklistDave Jones2011-11-041-0/+8
* | | | Merge branch 'pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/l...Linus Torvalds2011-11-011-5/+7
|\ \ \ \ | |/ / / |/| | |
| * | | pstore: make pstore write function return normal success/fail valueChen Gong2011-10-121-4/+6
| * | | pstore: change mutex locking to spin_locksDon Zickus2011-08-161-1/+1
* | | | Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Linus Torvalds2011-10-281-1/+2
|\ \ \ \
| * | | | PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge removePrarit Bhargava2011-10-141-1/+2
| | |/ / | |/| |
* | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-10-261-1/+0
|\ \ \ \
| * | | | llist: Make some llist functions inlineHuang Ying2011-10-041-1/+0
| |/ / /
* | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-10-261-14/+8
|\ \ \ \
| * | | | x86, nmi: Wire up NMI handlers to new routinesDon Zickus2011-10-101-14/+8
| |/ / /
* | | | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-10-261-5/+5
|\ \ \ \
| * | | | locking, ACPI: Annotate c3_lock as rawThomas Gleixner2011-09-131-5/+5
| | |/ / | |/| |
* | | | ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.Dave Jones2011-10-221-0/+8
* | | | PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvsBogdan Radulescu2011-10-161-0/+8
* | | | PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvsRafael J. Wysocki2011-10-161-0/+8
* | | | Merge branch 'pm-qos' into pm-for-linusRafael J. Wysocki2011-10-071-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | PM QoS: Move and rename the implementation filesJean Pihet2011-08-251-1/+1
| |/ /
| | |
| \ \
*-. \ \ Merge branches 'apei', 'bz-13195' and 'doc' into acpiLen Brown2011-09-123-2/+3
|\ \ \ \ | |_|/ / |/| | |
| | * | acpica: ACPI_MAX_SLEEP should be 2 sec, not 20Len Brown2011-08-291-1/+1
| |/ / |/| |
| * | ACPI APEI: Add Kconfig option IRQ_WORK for GHESChen Gong2011-08-111-0/+1
| * | APEI: Fix WHEA _OSC callMatthew Garrett2011-08-111-1/+1
|/ /
* | Merge branch 'battery' into releaseLen Brown2011-08-051-3/+7
|\ \
| * | Battery: sysfs_remove_battery(): possible circular lockingSergey Senozhatsky2011-08-051-3/+7
* | | Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2011-08-039-68/+516
|\ \ \
| * \ \ Merge branch 'apei' into apei-releaseLen Brown2011-08-039-68/+516
| |\ \ \
| | * | | ACPI, APEI, EINJ Param support is disabled by defaultHuang Ying2011-08-031-15/+24
| | * | | APEI GHES: 32-bit buildfixLen Brown2011-08-031-2/+3
| | * | | ACPI: APEI build fixLen Brown2011-08-031-2/+0
| | * | | ACPI, APEI, GHES: Add hardware memory error recovery supportHuang Ying2011-08-032-7/+24
| | * | | ACPI, APEI, GHES, Error records content based throttleHuang Ying2011-08-031-7/+177
| | * | | ACPI, APEI, GHES, printk support for recoverable error via NMIHuang Ying2011-08-032-18/+193
| | * | | ACPI, APEI, Add WHEA _OSC supportHuang Ying2011-07-133-0/+38
| | * | | ACPI, APEI, Add APEI bit support in generic _OSC callHuang Ying2011-07-131-2/+14
| | * | | ACPI, APEI, GHES, Support disable GHES at boot timeHuang Ying2011-07-132-8/+17