From: Greg Kroah-Hartman Date: Sat, 6 Dec 2014 16:17:24 +0000 (-0800) Subject: Merge 3.18-rc7 into tty-next X-Git-Tag: v3.19-rc1~79^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dd63af108f0814f0b589659f4e55a7a5af3b7e53;p=linux.git Merge 3.18-rc7 into tty-next This resolves the merge issue with drivers/tty/serial/of_serial.c Signed-off-by: Greg Kroah-Hartman --- dd63af108f0814f0b589659f4e55a7a5af3b7e53