Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 0 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 4d32e328f6cd..32b27739ec2a 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -296,12 +296,7 @@ static void ds1374_work(struct work_struct *work)
                 control &= ~(DS1374_REG_CR_WACE | DS1374_REG_CR_AIE);
                 i2c_smbus_write_byte_data(client, DS1374_REG_CR, control);
 
-                /* rtc_update_irq() assumes that it is called
-                 * from IRQ-disabled context.
-                 */
-                local_irq_disable();
                 rtc_update_irq(ds1374->rtc, 1, RTC_AF | RTC_IRQF);
-                local_irq_enable();
         }
 
 out: