projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f44ec32 c58cad4)
Merge branch develop-3.10
authorHuang, Tao <huangtao@rock-chips.com>
Fri, 13 Feb 2015 06:40:39 +0000 (14:40 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Fri, 13 Feb 2015 06:40:39 +0000 (14:40 +0800)
commit8e854569bebc2de9d4638cf79dd354d7619ad522
tree29ab8dce4dc46bc2f328e5638dad2d51728f2a6etree | snapshot
parentf44ec323d5d7419e1d2c4595e7e3375b7116fe41commit | diff
parentc58cad4928313f7f6ec7168418e6bcdb5fa2ca7ecommit | diff
Merge branch develop-3.10

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
Conflicts:
drivers/video/rockchip/rk_fb.c
drivers/usb/dwc_otg_310/dwc_otg_hcd_linux.c diff1 | diff2 | blob | history
drivers/usb/host/ehci-rockchip.c diff1 | diff2 | blob | history
drivers/video/rockchip/rk_fb.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.