Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

author 黄涛 <huangtao@rock-chips.com>

Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)

committer 黄涛 <huangtao@rock-chips.com>

Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
author 黄涛 <huangtao@rock-chips.com>
Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
committer 黄涛 <huangtao@rock-chips.com>
Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc block/blk-core.c

index 44f67b52c399c7b60bdea6f043137829c70e7a71,2f49f43c456543dac5a4b93926711921fc9aa825..84763c64f88f3b02d98e6099f15f7fa05a66fe8b

mode 100755,100644..100755
--- 1/block/blk-core.c
--- 2/block/blk-core.c
+++ b/block/blk-core.c
diff --cc kernel/module.c
Simple merge
diff --cc mm/shmem.c
Simple merge
author	黄涛 <huangtao@rock-chips.com>
	Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
committer	黄涛 <huangtao@rock-chips.com>
	Tue, 23 Oct 2012 02:06:51 +0000 (10:06 +0800)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/module.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	patch \|	diff1 \|	diff2 \|	blob \| history