Merge 3.7-rc1 into tty-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Oct 2012 05:41:27 +0000 (22:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Oct 2012 05:41:27 +0000 (22:41 -0700)
commitc362495586e8a3a6487a318fcd82eaf15ffe2142
tree86f7b195d36ba198f24f86be327f21a8d24ec248
parentb70936d9ffbf0f45f4fa13a03122f015f13ecdb0
parentddffeb8c4d0331609ef2581d84de4d763607bd37
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>