projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50d1e7d 009d043)
Merge 3.18-rc7 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2014 16:17:24 +0000 (08:17 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Dec 2014 16:17:24 +0000 (08:17 -0800)
This resolves the merge issue with drivers/tty/serial/of_serial.c

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

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/tty/serial/of_serial.c
Simple merge
John Crispins staging tree