projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
13b014a
3ffb240
)
Merge tag 'v4.9.181' into khadas-vims-4.9.y-update
author
Nick Xie
<nick@khadas.com>
Thu, 25 Jul 2019 10:03:59 +0000
(18:03 +0800)
committer
Nick Xie
<nick@khadas.com>
Thu, 25 Jul 2019 10:03:59 +0000
(18:03 +0800)
This is the 4.9.181 stable release
Conflicts:
drivers/android/binder.c
drivers/firmware/efi/libstub/arm-stub.c
drivers/firmware/efi/libstub/efi-stub-helper.c
20 files changed:
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
drivers/firmware/efi/libstub/efi-stub-helper.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/media/usb/uvc/uvc_driver.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/serial_core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/core/quirks.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/host/xhci-ring.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/host/xhci.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/fuse/dev.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/fuse/file.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/open.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/read_write.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/cpu.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/fs.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/mm.h
patch
|
diff1
|
diff2
|
blob
|
history
include/uapi/linux/fuse.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/cpu.c
patch
|
diff1
|
diff2
|
blob
|
history
kernel/trace/trace.c
patch
|
diff1
|
diff2
|
blob
|
history
net/core/fib_rules.c
patch
|
diff1
|
diff2
|
blob
|
history
net/ipv6/raw.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile
Simple merge
diff --cc
drivers/firmware/efi/libstub/efi-stub-helper.c
Simple merge
diff --cc
drivers/media/usb/uvc/uvc_driver.c
Simple merge
diff --cc
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
Simple merge
diff --cc
drivers/tty/serial/serial_core.c
Simple merge
diff --cc
drivers/usb/core/quirks.c
Simple merge
diff --cc
drivers/usb/host/xhci-ring.c
Simple merge
diff --cc
drivers/usb/host/xhci.c
Simple merge
diff --cc
fs/fuse/dev.c
Simple merge
diff --cc
fs/fuse/file.c
Simple merge
diff --cc
fs/open.c
Simple merge
diff --cc
fs/read_write.c
Simple merge
diff --cc
include/linux/cpu.h
Simple merge
diff --cc
include/linux/fs.h
Simple merge
diff --cc
include/linux/mm.h
Simple merge
diff --cc
include/uapi/linux/fuse.h
Simple merge
diff --cc
kernel/cpu.c
Simple merge
diff --cc
kernel/trace/trace.c
Simple merge
diff --cc
net/core/fib_rules.c
Simple merge
diff --cc
net/ipv6/raw.c
Simple merge