tree 795197f8ec2bc5ba42ee975ecd4d5a16c64e063c
parent fe89def79c48e2149abdd1e816523e69a9067191
parent 6b16351acbd415e66ba16bf7d473ece1574cf0bc
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1340751869 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1340751869 -0700

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>