From: 黄涛 <huangtao@rock-chips.com>
Date: Thu, 21 Nov 2013 05:28:24 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro... 
X-Git-Tag: firefly_0821_release~6436^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68a6548244be981d4844e143c166e5ef63f50d38;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro-lsk-v3.10-android+android-common-3.10

Conflicts:
	kernel/printk.c
---

68a6548244be981d4844e143c166e5ef63f50d38