]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 02:15:18 +0000 (19:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jul 2009 02:15:18 +0000 (19:15 -0700)
commit91a5698d1f253d30f53f0c58d2504eaec481b854
tree684d8060e16b33c6ede5b814dbd459e0c5cb1f39
parent084bad91afd0f40ff4db9ceb56e29234c314d8d1
parentdddac6a7b445de95515f64fdf82fe5dc36c02f26
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