projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d954331 38c0a0c)
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)
* '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


Trivial merge
John Crispins staging tree