]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'acpi' of git://github.com/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Sep 2011 03:39:53 +0000 (20:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Sep 2011 03:39:53 +0000 (20:39 -0700)
commit07a83d4fb0a96b93489b5a02254d7b9c2c7bcb12
treec8e2a2fcd9dc2949c4d7a3ff9d4ac84d15700f21
parent58ff0e3ca7fd38865067478a37e83b8721b55b44
parent2d1446929e02ebeb7e4504d4df04de69ac30886e
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