| commit | dd7c7c3f69291baa488b8a50db683d5fbf44166a | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Sat Nov 26 20:07:25 2011 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Sat Nov 26 20:07:25 2011 -0800 |
| tree | 925bf294f30dffaa67a983c3859926ff53937e14 | |
| parent | 161e773cbd0c3d1b5b8cc00602e1f72de61ed4f7 [diff] | |
| parent | caca6a03d365883564885f2c1da3e88dcf65d139 [diff] |
Merge 3.2-rc3 into tty-next to handle merge conflict in tty_ldisc.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>