Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
drivers/vhost/net.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/gadget/Makefile
drivers/usb/gadget/function/Makefile
drivers/usb/gadget/legacy/Makefile
drivers/usb/phy/phy-mxs-usb.c
drivers/usb/phy/phy-samsung-usb.h
|
|
Conflicts:
drivers/leds/led-class.c
drivers/leds/led-core.c
include/linux/leds.h
|
|
|
|
|
|
Conflicts:
fs/ext4/super.c
|
|
|
|
Conflicts:
arch/arm64/include/asm/kvm_host.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
fs/nfsd/vfs.c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
drivers/gpu/drm/i915/intel_display.c
|
|
|
|
|
|
|
|
Conflicts:
net/bluetooth/hci_conn.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
|
|
|
|
|
|
|
|
|
|
|
|
|