linux-next: manual merge of the tip tree with the usb-gadget-fixes tree
From: Stephen Rothwell
Date: Tue Mar 10 2015 - 22:42:01 EST
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 entirely") from the tip tree.
I fixed it up (the latter is a subset of the former) and can carry the
fix as necessary (no action is required).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: OpenPGP digital signature