git.maquefel.me Git - linux.git/commit

Merge tag 'v3.19-rc5' into next

Linux 3.19-rc5

Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

drivers/usb/dwc2/gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/dwc3-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/dwc3/gadget.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_hid.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_uac1.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc/atmel_usba_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/udc/bdc/bdc_ep.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_debugfs.c	diff1 \|	diff2 \|	blob \| history