From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2010 21:06:19 +0000 (-0700)
Subject: Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe... 
X-Git-Tag: upstream/snapshot3+hdmi~13121
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f4dbeca1a5bac4552d49d9e7b774da9f6625e74;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'pm-fixes' of git://git./linux/kernel/git/rafael/suspend-2.6

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM QoS: Fix inline documentation.
  PM QoS: Fix kzalloc() parameters swapped in pm_qos_power_open()
---

6f4dbeca1a5bac4552d49d9e7b774da9f6625e74