From: Felipe Balbi Date: Mon, 19 Jan 2015 15:57:20 +0000 (-0600) Subject: Merge tag 'v3.19-rc5' into next X-Git-Tag: fixes-v4.0-rc1~102^2^2~101 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1fc4440d761af47fd0c32661725011bf66ebb51;p=pandora-kernel.git 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 --- d1fc4440d761af47fd0c32661725011bf66ebb51 Reading git-diff-tree failed