Merge branch 'v3.6-rc7' into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 19:32:42 +0000 (12:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 19:32:42 +0000 (12:32 -0700)
commit467a3ca5cab64a16b5ec46ebb1895c84c280dcfe
tree68096d5b17e884d270420d50e466186c73019830
parent40c9f61eae9098212b6906f29f30f08f7a19b5e2
parent84a1caf1453c3d44050bd22db958af4a7f99315c
Merge branch 'v3.6-rc7' into tty-next

This is to sync up on Linus's branch to get the other tty and core changes.

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