projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 30be6d7 c0bd4b6)
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
author黄涛 <huangtao@rock-chips.com>
Thu, 12 Jul 2012 10:46:41 +0000 (18:46 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 12 Jul 2012 10:46:41 +0000 (18:46 +0800)
commita2ad9f9801deab2189d36ec0bbcf5192c9a2f635
tree2d3d13834f32025c30f25c0178c91894dcdca15ftree | snapshot
parent30be6d79726beb30f7e3898aff40eb365eaabf32commit | diff
parentc0bd4b6a0c6c0d42235920fb7ddd7110c86e2adbcommit | diff
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
drivers/net/usb/asix.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/usb/serial/option.c
21 files changed:
Makefile diff1 | diff2 | blob | history
arch/arm/kernel/smp.c diff1 | diff2 | blob | history
block/genhd.c diff1 | diff2 | blob | history
drivers/gpio/Kconfig diff1 | diff2 | blob | history
drivers/media/video/uvc/uvc_v4l2.c diff1 | diff2 | blob | history
drivers/mmc/core/sdio.c diff1 | diff2 | blob | history
drivers/mtd/nand/nand_bbt.c diff1 | diff2 | blob | history
drivers/net/Kconfig diff1 | diff2 | blob | history
drivers/net/usb/usbnet.c diff1 | diff2 | blob | history
drivers/tty/serial/serial_core.c diff1 | diff2 | blob | history
drivers/usb/serial/option.c diff1 | diff2 | blob | history
drivers/usb/serial/usb-serial.c diff1 | diff2 | blob | history
fs/block_dev.c diff1 | diff2 | blob | history
fs/buffer.c diff1 | diff2 | blob | history
include/linux/mmc/host.h diff1 | diff2 | blob | history
include/linux/usb/usbnet.h diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/wireless/reg.c diff1 | diff2 | blob | history
net/xfrm/xfrm_policy.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.