Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:47:47 +0000 (12:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jul 2011 19:47:47 +0000 (12:47 -0700)
commita6b52a9db891e2a39e8a0fed6005935d8b1aa59c
tree3fbef9df274667d1e96894c2b8c373b7192cfaf1
parent247dc220f410969b35f884f1554fe9b78119dd59
parent7fb574a97f7147610c44cef55d0cde2409392a80
Merge branch 'release' of git://git./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: Fixes device power states array overflow
  ACPI, APEI, HEST, Detect duplicated hardware error source ID
  ACPI: Fix lockdep false positives in acpi_power_off()