From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 6 Dec 2007 22:14:16 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f194d132e4971111f85c18c96067acffb13cee6d;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'release' of git://git./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
---

f194d132e4971111f85c18c96067acffb13cee6d