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)
commitca364d8388602b5c0d607c5452774833cc1ad667
tree4c6aa0a71c89b813c73c112391005fc00e44841a
parent84fd7bdf1266ee6228319903af7e58702745024d
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
Merge 3.7-rc3 into tty-next

This merges the tty changes in 3.7-rc3 into tty-next

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/omap-serial.c
fs/compat_ioctl.c