Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 May 2012 17:06:06 +0000 (10:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 May 2012 17:06:06 +0000 (10:06 -0700)
commit59068e369b6a2a0a15b93624887525d9ec0f36e5
tree7d165bb50d379e37ca7f0b3fed5da9f7719e22e4
parent377485f6244af255b04d662cf19cddbbc4ae4310
parent1cc0c998fdf2cb665d625fb565a0d6db5c81c639
Merge branch 'release' of git://git./linux/kernel/git/lenb/linux

Pull an ACPI patch from Len Brown:
 "It fixes a D3 issue new in 3.4-rc1."

By Lin Ming via Len Brown:
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  ACPI: Fix D3hot v D3cold confusion