commit | c362495586e8a3a6487a318fcd82eaf15ffe2142 | [log] [tgz] |
---|---|---|
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Oct 14 22:41:27 2012 -0700 |
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Sun Oct 14 22:41:27 2012 -0700 |
tree | 86f7b195d36ba198f24f86be327f21a8d24ec248 | |
parent | b70936d9ffbf0f45f4fa13a03122f015f13ecdb0 [diff] | |
parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 [diff] |
Merge 3.7-rc1 into tty-linus This syncs up the tty-linus branch to the latest in Linus's tree to get all of the UAPI stuff needed for the next set of patches to merge. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>