Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
author黄涛 <huangtao@rock-chips.com>
Thu, 27 Dec 2012 04:57:21 +0000 (12:57 +0800)
committer黄涛 <huangtao@rock-chips.com>
Thu, 27 Dec 2012 04:57:21 +0000 (12:57 +0800)
commit1bdf414f0e84042659c6d6739f58536d3162ade4
treedb286a609a69f2ca6826cd270b38cb3d41e6a24a
parent5410736e6ab1c37c2061df72002aa2b006d3c3c9
parent881c0a027c495dd35992346176a40d39a7666fb9
Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

Conflicts:
Makefile
arch/arm/vfp/vfpmodule.c
drivers/usb/serial/option.c
mm/shmem.c