diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 20:39:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 20:39:53 -0700 |
| commit | 2f4d3218e95d48de2951dcf2bea619ea49ef93de (patch) | |
| tree | c8e2a2fcd9dc2949c4d7a3ff9d4ac84d15700f21 /drivers/pci | |
| parent | d9543314ee4b6b276af539cc9fc12c614816c74a (diff) | |
| parent | 38c0a0c9ae0d145d72c6865f4aec1107aef81310 (diff) | |
Merge branch 'acpi' of git://github.com/lenb/linux
* 'acpi' of git://github.com/lenb/linux:
acpica: ACPI_MAX_SLEEP should be 2 sec, not 20
ACPI APEI: Add Kconfig option IRQ_WORK for GHES
PNP: update pnp.debug usage (needs value on command line)
APEI: Fix WHEA _OSC call
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions