From: 黄涛 <huangtao@rock-chips.com>
Date: Tue, 23 Oct 2012 02:06:51 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0
X-Git-Tag: firefly_0821_release~8344
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fd3316fde02fdeab8b36fcd60cad6a4a840421bc;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	Makefile
---

fd3316fde02fdeab8b36fcd60cad6a4a840421bc
diff --cc block/blk-core.c
index 44f67b52c399,2f49f43c4565..84763c64f88f
mode 100755,100644..100755
--- a/block/blk-core.c
+++ b/block/blk-core.c