Merge branch 'misc-2.6.32' into release

Conflicts:
	drivers/pci/dmar.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index af04f5b049db..c2842171cec6 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -507,7 +507,7 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)
         }
         if (bluetooth_rfkill) {
                 rfkill_unregister(bluetooth_rfkill);
-                rfkill_destroy(wifi_rfkill);
+                rfkill_destroy(bluetooth_rfkill);
         }
         if (wwan_rfkill) {
                 rfkill_unregister(wwan_rfkill);