Commit 9035a645 authored Jan 08, 2010 by Linus Torvalds

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

drivers/platform/x86/hp-wmi.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -393,8 +393,6 @@ static void hp_wmi_notify(u32 value, void *context)
		} else
		printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
		eventcode);

		kfree(obj);
		}

		static int __init hp_wmi_input_setup(void)