From: Greg Kroah-Hartman Date: Mon, 8 Jun 2015 17:49:28 +0000 (-0700) Subject: Merge 4.1-rc7 into tty-next X-Git-Tag: firefly_0821_release~176^2~1544^2~10 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=00fda1682efdbd62a20a8a21aee52d994c323c7f;p=firefly-linux-kernel-4.4.55.git Merge 4.1-rc7 into tty-next This fixes up a merge issue with the amba-pl011.c driver, and we want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman --- 00fda1682efdbd62a20a8a21aee52d994c323c7f