Merge 4.10-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
commit7bddba775026d51dede9d726bd8158574c0ec5a6
tree6ec6b7cfd9ef9a7915bf1f4ce13cff1d3944694f
parent530b7a3e216e8a73ba0e0c364dbec330113bf86c
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
Merge 4.10-rc7 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/function/f_fs.c
drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h