Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index acbce5745b0c..303ccce05bb3 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -436,10 +436,6 @@ static const struct hid_device_id apple_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 
-        /* Apple wireless Mighty Mouse */
-        { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),
-                .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
-
         { }
 };
 MODULE_DEVICE_TABLE(hid, apple_devices);