summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2012-01-111-5/+5
|\
| * PCI/PM/Runtime: make PCI traces quieterVincent Palatin2012-01-061-5/+5
| * PCI: Rework ASPM disable codeMatthew Garrett2012-01-061-0/+7
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommuLinus Torvalds2012-01-101-0/+7
|\ \
| * | PCI: Rework ASPM disable codeMatthew Garrett2011-12-051-0/+7
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-082-2/+2
|\ \
| * | Kconfig: acpi: Fix typo in comment.Justin P. Mattock2012-01-041-1/+1
| * | treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-021-1/+1
* | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-0/+16
|\ \ \
| * \ \ Merge branch 'master' into pm-sleepRafael J. Wysocki2011-12-211-9/+22
| |\ \ \ | | | |/ | | |/|
| * | | ACPI / PM: Do not save/restore NVS on Asus K54C/K54HRKeng-Yu Lin2011-12-061-0/+16
| | |/ | |/|
* | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-082-2/+2
|\ \ \
| * | | switch debugfs to umode_tAl Viro2012-01-031-1/+1
| * | | switch procfs to umode_t useAl Viro2012-01-031-1/+1
| | |/ | |/|
* | | Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2012-01-072-4/+3
|\ \ \
| * \ \ Merge branch 'driver-core-next' into Linux 3.2Greg Kroah-Hartman2012-01-062-4/+3
| |\ \ \ | | |/ / | |/| |
| | * | cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystemKay Sievers2011-12-212-4/+3
* | | | pstore: pass reason to backend write callbackKees Cook2011-11-171-2/+4
|/ / /
* | | pstore: pass allocated memory region back to callerKees Cook2011-11-171-9/+22
| |/ |/|
* | ACPI / cpuidle: Remove acpi_idle_suspend (to fix suspend regression)Rafael J. Wysocki2011-11-121-29/+0
|/
* 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
OpenPOWER on IntegriCloud