linux-next: manual merge of the tip tree with the usb-gadget-fixes tree

2015-03-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/usb/isp1760/isp1760-core.c between commit 80b4a0f8feeb ("usb: isp1760: set IRQ flags properly") from the usb-gadget-fixes tree and commit d8bf368d0631 ("genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag

linux-next: manual merge of the tip tree with the usb-gadget-fixes tree

2015-03-10 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/usb/isp1760/isp1760-core.c between commit 80b4a0f8feeb (usb: isp1760: set IRQ flags properly) from the usb-gadget-fixes tree and commit d8bf368d0631 (genirq: Remove the deprecated 'IRQF_DISABLED' request_irq() flag