Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c
authorGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 04:07:25 +0000 (20:07 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 04:07:25 +0000 (20:07 -0800)
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Trivial merge