Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:39:12 +0000 (12:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Jun 2008 19:39:12 +0000 (12:39 -0700)
commit77a189c28b44035ff1b6841df32c43af8a9e8399
treefc72ff43367d887da25a63b523eb7380d85094a1
parent9aef85cc58f54f01bbbafdb3c87af4465f4257c0
parent5a87f7f5e523030aa6fe732ec338fd53c9a11c42
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: no AC status notification
  ACPI Exception (video-1721): UNKNOWN_STATUS_CODE, Cant attach device