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)
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)
diff --cc arch/arm/vfp/vfpmodule.c
Simple merge
diff --cc drivers/usb/serial/option.c

index e43db6a0192ced541da63b14009d07e0fc3b99ce,872807ba38c59fdc1f3f782e7113b455188b88a4..a95a8fe788a5412c1725966f0d3fa4a2f494e7ea

mode 100755,100644..100755
--- 1/drivers/usb/serial/option.c
--- 2/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
diff --cc mm/shmem.c
Simple merge
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)
		1	2
arch/arm/vfp/vfpmodule.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/option.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	patch \|	diff1 \|	diff2 \|	blob \| history