Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
commitc8b1ef88d09961078d3c685fcdc1d1659db05231
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:23:32 +0000 (3 08:23 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:23:32 +0000 (3 08:23 -0800)
tree54b72198e0d066a54583ccdf0bd6d01dd90c6722
parentca6435f188a0ce40eae716c158053e49130886a3
parent6ac47735cdba6ac8c64cb7595762a75fdcafaa6d
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:
  ACPICA: fix acpi-cpufreq boot crash due to _PSD return-by-reference
  ACPI: Delete the IRQ operation in throttling controll via PTC