Merge branch 'timers/urgent' into timers/core

Reason: Get upstream fixes and kfree_rcu which is necessary for a
follow up patch.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 0 insertions, 1 deletions

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index c871eae14120..ede16c64ff07 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1964,7 +1964,6 @@ static int __init atari_floppy_init (void)
                 unit[i].disk->first_minor = i;
                 sprintf(unit[i].disk->disk_name, "fd%d", i);
                 unit[i].disk->fops = &floppy_fops;
-                unit[i].disk->events = DISK_EVENT_MEDIA_CHANGE;
                 unit[i].disk->private_data = &unit[i];
                 unit[i].disk->queue = blk_init_queue(do_fd_request,
                                         &ataflop_lock);