From: Tejun Heo Date: Thu, 16 Jan 2014 14:44:34 +0000 (-0500) Subject: Merge branch 'for-3.13-fixes' into for-3.14 X-Git-Tag: firefly_0821_release~176^2~4611^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e1af69780a4df749d28a129596ed576a0d7996c;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-3.13-fixes' into for-3.14 A scheduled horkage patch will conflict with HORKAGE changes in for-3.13-fixes. Pull in to avoid unnecessary merge conflicts. Signed-off-by: Tejun Heo --- 6e1af69780a4df749d28a129596ed576a0d7996c