]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfd92b2ad23169bac0c7eee00b7e0e737465d11ce
tree15d1997a50a971b83c9c577299cbbd414fe512c4
parente7380a8fcbd76d62f381bc960054ac769d2ae4f7
parentecd3c0bf6f3a8bd941c2e440557bc0f7cd3474fa
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/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()