From: 黄涛 Date: Tue, 17 Dec 2013 06:41:09 +0000 (+0800) Subject: Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into... X-Git-Tag: firefly_0821_release~6436^2~1 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d426f612e5ed7e45afb695bfbd78dcb5f16ec3e;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into linux-linaro-lsk-v3.10-android+android-common-3.10 Conflicts: kernel/printk.c --- 4d426f612e5ed7e45afb695bfbd78dcb5f16ec3e