]> err.no Git - linux-2.6/commit
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Dec 2007 22:14:16 +0000 (14:14 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 6 Dec 2007 22:14:16 +0000 (14:14 -0800)
commitf194d132e4971111f85c18c96067acffb13cee6d
treee7510b0f2300e059db3fbe850b68667af28531f0
parent09f3eca2b7e2762e223fdd359f9d0f6303a85f6c
parent982286d1b8e438f595cdc9304cc4c185c7b90a39
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: suspend: old debugging hacks sneaked back
  Freezer: Fix JFFS2 garbage collector freezing issue (rev. 2)
  HWMON: coretemp, suspend fix
  Freezer: Fix APM emulation breakage
  Freezer: Fix s2disk resume from initrd