Merge commit 'v2.6.32-rc7'

Resolve the conflict between v2.6.32-rc7 where dn_def_dev_handler
gets a small bug fix and the sysctl tree where I am removing all
sysctl strategy routines.

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 7ba91aa3fe8b..2fb38027f3bb 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -591,6 +591,7 @@ static int btusb_close(struct hci_dev *hdev)
                 return 0;
 
         cancel_work_sync(&data->work);
+        cancel_work_sync(&data->waker);
 
         clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
         clear_bit(BTUSB_BULK_RUNNING, &data->flags);