Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:06:19 +0000 (14:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:06:19 +0000 (14:06 -0700)
commit6f4dbeca1a5bac4552d49d9e7b774da9f6625e74
tree15d1997a50a971b83c9c577299cbbd414fe512c4
parent2547d1d20f3a252567f974de8ce1c572a0815d5a
parent25cc69ec34a563e943e85b3b68a79a8aac7f076d
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()