From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 17:32:50 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9035a6450d124a7787e5e3272b630a79d201555f;p=deliverable%2Flinux.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:
  hp-wmi: remove double free caused by merge conflict
---

9035a6450d124a7787e5e3272b630a79d201555f