git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Anisse Astier <anisse@astier.eu>
	Thu, 31 Dec 2009 15:41:33 +0000 (16:41 +0100)
committer	Len Brown <len.brown@intel.com>
	Fri, 1 Jan 2010 19:04:25 +0000 (14:04 -0500)
commit	c9c041fcb1a4d69ed4791f00b57554eeb341d148
tree	6492925790949f9a23ded26089956207a5f03423	tree \| snapshot (tar.gz zip)
parent	cd6e125c58ae1561bedb6ea6f70b00d6c2599d62	commit \| diff

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>