Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jul 2012 19:44:26 +0000 (12:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Jul 2012 19:44:26 +0000 (12:44 -0700)
commitc5b01acff187b12ec56363193208a7a4cf2469d8
tree74fd1ff8db1a40184f503956aeaccc7897fc8c7e
parent09d314425f5bc69fcf793c7890d9e6a3cdcb44be
parent46befd6b38d802dfc5998e7d7938854578b45d9d
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux

Pull ACPI patch from Len Brown.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  ACPICA: Fix possible fault in return package object repair code