review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3df613e 30a7acd)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 2 Jan 2018 14:13:41 +0000 (15:13 +0100)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 2 Jan 2018 14:13:41 +0000 (15:13 +0100)
commit	01f1918833e4817fdb0810306c021c5cbee775d3
tree	34a649c453d30fee1f1b564badb6e3dc210655c3	tree \| snapshot
parent	3df613ec12f71f00dad545a9df75573951e5c59f	commit \| diff
parent	30a7acd573899fd8b8ac39236eff6468b195ac7d	commit \| diff

Merge 4.15.0-rc6 into usb-next

We want the USB fixes in here, and this resolves a merge issue with the
vhci_rx.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/usb/host/xhci-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/usbip/stub_rx.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;