projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84fd7bd 8f0d816)
Merge 3.7-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 16:00:57 +0000 (09:00 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Oct 2012 16:00:57 +0000 (09:00 -0700)
This merges the tty changes in 3.7-rc3 into tty-next

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

diff --cc drivers/tty/serial/omap-serial.c
Simple merge
diff --cc fs/compat_ioctl.c
Simple merge
John Crispins staging tree