d69ed4791f00b57554eeb341d148
author Linus Torvalds <torvalds@linux-foundation.org> 1262971970 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262971970 -0800

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:
  hp-wmi: remove double free caused by merge conflict
&à¨k™,x