projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fe1ae7c fe34c84)
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Mon, 18 Feb 2013 04:31:44 +0000 (12:31 +0800)
committer黄涛 <huangtao@rock-chips.com>
Mon, 18 Feb 2013 04:31:44 +0000 (12:31 +0800)
commit14d96d73a2ec87bd9e4604a4f5f9b1bb14e7387a
tree25c06d7dc7cd7d925228a83d997fba3ed9c2ed54tree | snapshot
parentfe1ae7cd74f185f9727b9f29ddd715963457b8c8commit | diff
parentfe34c843d97c4fa082fe66dc3a65e7bd5603c70ccommit | diff
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Merge v3.0.65
Conflicts:
Makefile
drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/htc_hst.c
MAINTAINERS diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history
net/bluetooth/hci_event.c diff1 | diff2 | blob | history
net/bluetooth/hidp/core.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.