Merge 3.4-rc3 into tty-next

This allows us to pick up some changes needed for other serial patches.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2012-04-18 15:57:31 -07:00
commit 665ab0f3c8
362 changed files with 3400 additions and 2650 deletions

View file

@ -176,7 +176,7 @@ static void if_close(struct tty_struct *tty, struct file *filp)
struct cardstate *cs = tty->driver_data;
if (!cs) { /* happens if we didn't find cs in open */
printk(KERN_DEBUG "%s: no cardstate\n", __func__);
gig_dbg(DEBUG_IF, "%s: no cardstate", __func__);
return;
}