Merge 3.7-rc3 into tty-next
Greg Kroah-Hartman [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
fs/compat_ioctl.c

Simple merge
Simple merge