| commit | c87985a3ce723995fc7b25e598238d67154108a1 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Aug 06 09:48:31 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Aug 06 09:48:31 2012 -0700 |
| tree | e60def1b77c25c1d74180f62e8a5603f9826f209 | |
| parent | d155255a344c417acad74156654295a2964e6b81 [diff] | |
| parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee [diff] |
Merge tty-next into 3.6-rc1 This handles the merge issue in: arch/um/drivers/line.c arch/um/drivers/line.h And resolves the duplicate patches that were in both trees do to the tty-next branch not getting merged into 3.6-rc1. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>