diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:06:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:06:19 -0400 |
| commit | 6f4dbeca1a5bac4552d49d9e7b774da9f6625e74 (patch) | |
| tree | 15d1997a50a971b83c9c577299cbbd414fe512c4 /fs/nfsd | |
| parent | 2547d1d20f3a252567f974de8ce1c572a0815d5a (diff) | |
| parent | 25cc69ec34a563e943e85b3b68a79a8aac7f076d (diff) | |
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()
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions