diff options
| author | Linus Torvalds <[email protected]> | 2010-08-28 21:06:19 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-08-28 21:06:19 +0000 |
| commit | 6f4dbeca1a5bac4552d49d9e7b774da9f6625e74 (patch) | |
| tree | 15d1997a50a971b83c9c577299cbbd414fe512c4 /net/unix/af_unix.c | |
| parent | Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux (diff) | |
| parent | PM QoS: Fix inline documentation. (diff) | |
| download | kernel-6f4dbeca1a5bac4552d49d9e7b774da9f6625e74.tar.gz kernel-6f4dbeca1a5bac4552d49d9e7b774da9f6625e74.zip | |
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 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions
