From: Anisse Astier <anisse@astier.eu>
Date: Thu, 31 Dec 2009 15:41:33 +0000 (+0100)
Subject: hp-wmi: remove double free caused by merge conflict
X-Git-Tag: v2.6.33-rc4~73^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9c041fcb1a4d69ed4791f00b57554eeb341d148;p=pandora-kernel.git

hp-wmi: remove double free caused by merge conflict

Commit 3e9b988e4edf065d39c1343937f717319b1c1065
"wmi: Free the allocated acpi objects through wmi_get_event_data"
had the same purpose as commit
44ef00e6482e755f36629773abc2aee83a6f53e3
"hp-wmi: Fix two memleaks"

This should solve this regression:

http://bugzilla.kernel.org/show_bug.cgi?id=14890

Signed-off-by: Anisse Astier <anisse@astier.eu>
Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

Reading git-diff-tree failed