| commit | 2ba3abd8186f24c7fb418927025b4e2120e3a362 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 13 17:49:48 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 13 17:49:48 2010 -0700 |
| tree | 1b88919b5e687c77627d91855b214ed5067997da | |
| parent | 0fdfe5ad2802e747460bf48eb2eb0ca3d3f3af42 [diff] | |
| parent | d88d4050dcaf09e417aaa9a5024dd9449ef71b2e [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 / Hibernate: user.c, fix SNAPSHOT_SET_SWAP_AREA handling