diff options
| author | Linus Torvalds | 2010-04-02 19:44:42 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-02 19:44:42 -0700 |
| commit | 24b99d1576e6e330c2eba534a793b6e6dcb37f6b (patch) | |
| tree | c8ad2d4ad7e06161d1b12013e91bf34d5eb9f556 /include/linux/matroxfb.h | |
| parent | 6da8d866d0d39e9509ff826660f6a86a6757c966 (diff) | |
| parent | 5a7aadfe2fcb0f69e2acc1fbefe22a096e792fc9 (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:
Freezer: Fix buggy resume test for tasks frozen with cgroup freezer
Freezer: Only show the state of tasks refusing to freeze
Diffstat (limited to 'include/linux/matroxfb.h')
0 files changed, 0 insertions, 0 deletions