diff options
| author | Linus Torvalds <[email protected]> | 2009-09-30 15:11:24 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-09-30 15:11:24 +0000 |
| commit | 9c1fe834c1bd7725b411055c66886b64c928083d (patch) | |
| tree | 4321cc45b60988a28dc384c1b189f33d4c95d830 /fs/proc/array.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | PM / yenta: Fix cardbus suspend/resume regression (diff) | |
| download | kernel-9c1fe834c1bd7725b411055c66886b64c928083d.tar.gz kernel-9c1fe834c1bd7725b411055c66886b64c928083d.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 / yenta: Fix cardbus suspend/resume regression
PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions