From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 May 2012 17:06:06 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
X-Git-Tag: upstream/snapshot3+hdmi~7561
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=59068e369b6a2a0a15b93624887525d9ec0f36e5;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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
---

59068e369b6a2a0a15b93624887525d9ec0f36e5