diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 14:33:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 14:33:33 -0800 |
| commit | 3907969596091f429b7864cfe4e473a227876a96 (patch) | |
| tree | 7c8e826af7a886a02298c1c0c00a466476c6e626 /drivers/oprofile/oprofile_perf.c | |
| parent | 66ef6aa63defa54b2c7e8edcc69e0641d2bb61ef (diff) | |
| parent | 23437b5c50f523a87ca5c02fd883b069ca8be7f3 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130D
ACPI/HEST: adjust section selection
ACPI: eliminate unused variable warning for !ACPI_SLEEP
ACPI/PNP: avoid section mismatch warning
ACPI thermal: remove two unused functions
ACPI: fix a section mismatch
ACPI, APEI, use raw spinlock in ERST
ACPI: video: fix build for CONFIG_ACPI=n
ACPI: video: fix build for VIDEO_OUTPUT_CONTROL=n
ACPI: fix allowing to add/remove multiple _OSI strings
acpi: fix _OSI string setup regression
ACPI: EC: Add another dmi match entry for MSI hardware
ACPI battery: update status upon sysfs query
ACPI ac: update AC status upon sysfs query
ACPI / PM: Do not refcount power resources that can't be turned on
ACPI / PM: Check device state before refcounting power resources
Diffstat (limited to 'drivers/oprofile/oprofile_perf.c')
0 files changed, 0 insertions, 0 deletions