diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 12:35:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-08 12:35:22 -0400 |
| commit | ed7ba2ef09254b2fd9698708b407f4652d26e36a (patch) | |
| tree | d16ea988b54d906704003ab086498c184afe1a1f /block/blk-merge.c | |
| parent | 4b99d3527041bec1abe9903263a3a1b7d2ba0c4a (diff) | |
| parent | 886a7a3371da8ee46a13f8e598a536bd8765b837 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM: Clear -EAGAIN in dpm_prepare
x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions