Merge 3.5-rc4 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jun 2012 23:04:29 +0000 (16:04 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Jun 2012 23:04:29 +0000 (16:04 -0700)
commitfc915c8b930c3114f2a838f7e2cd8789ad6fedc3
tree795197f8ec2bc5ba42ee975ecd4d5a16c64e063c
parentfe89def79c48e2149abdd1e816523e69a9067191
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc
Merge 3.5-rc4 into tty-next

This is to pick up the serial port and tty changes in Linus's tree to allow
everyone to sync up.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250.c
drivers/tty/serial/amba-pl011.c
drivers/usb/serial/usb-serial.c