]> www.infradead.org Git - users/hch/xfs.git/commitdiff
projects / users / hch / xfs.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a4f2dc9 c095ba7)
Merge 3.11-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2013 21:41:03 +0000 (05:41 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Aug 2013 21:41:03 +0000 (05:41 +0800)
We want the tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/serial/arc_uart.c patch | diff1 | diff2 | blob | history
drivers/tty/serial/mxs-auart.c patch | diff1 | diff2 | blob | history

diff --cc drivers/tty/serial/arc_uart.c
Simple merge
diff --cc drivers/tty/serial/mxs-auart.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.