diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 11:11:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-30 11:11:24 -0400 |
| commit | 9c1fe834c1bd7725b411055c66886b64c928083d (patch) | |
| tree | 4321cc45b60988a28dc384c1b189f33d4c95d830 /fs/nls | |
| parent | 5a4c8d75f4ff512c42065a7125d02dffe27966ce (diff) | |
| parent | 0c570cdeb8fdfcb354a3e9cd81bfc6a09c19de0c (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 / yenta: Fix cardbus suspend/resume regression
PM / PCMCIA: Drop second argument of pcmcia_socket_dev_suspend()
Diffstat (limited to 'fs/nls')
0 files changed, 0 insertions, 0 deletions