| commit | 91a5698d1f253d30f53f0c58d2504eaec481b854 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 29 19:15:18 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 29 19:15:18 2009 -0700 |
| tree | 684d8060e16b33c6ede5b814dbd459e0c5cb1f39 | |
| parent | 084bad91afd0f40ff4db9ceb56e29234c314d8d1 [diff] | |
| parent | dddac6a7b445de95515f64fdf82fe5dc36c02f26 [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: Replace bdget call with simple atomic_inc of i_count PM / ACPI: HP G7000 Notebook needs a SCI_EN resume quirk