From: Greg Kroah-Hartman Date: Sun, 13 Jul 2014 22:26:47 +0000 (-0700) Subject: Merge 3.16-rc5 into char-misc-next X-Git-Tag: firefly_0821_release~176^2~3493^2~17 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9f48c89862e39b7f33b44123fc425cf901c89428;p=firefly-linux-kernel-4.4.55.git Merge 3.16-rc5 into char-misc-next This resolves a number of merge issues with changes in this tree and Linus's tree at the same time. Signed-off-by: Greg Kroah-Hartman --- 9f48c89862e39b7f33b44123fc425cf901c89428