Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Thu, 1 Nov 2012 09:13:08 +0000 (17:13 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 1 Nov 2012 09:13:08 +0000 (17:13 +0800)
commit903d694ab5878781502eb798012604aaac27c466
tree3b5368e8e6311420052f1030f2c04dc009d76277
parent0b5bd7d634adbe85e6ac4dde6c0b2aaedd44a86a
parent27d0858dbcf199838b8c50a3e94d397bf326d986
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
Makefile
arch/arm/kernel/smp.c
block/blk-core.c
drivers/usb/core/hub.c
drivers/usb/serial/option.c
kernel/cgroup.c
kernel/sys.c