diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:32:42 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:32:42 +0200 |
commit | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (patch) | |
tree | 68096d5b17e884d270420d50e466186c73019830 /drivers/media/video/gspca/kinect.c | |
parent | tty ldisc: Close/Reopen race prevention should check the proper flag (diff) | |
parent | Linux 3.5-rc7 (diff) | |
download | linux-467a3ca5cab64a16b5ec46ebb1895c84c280dcfe.tar.xz linux-467a3ca5cab64a16b5ec46ebb1895c84c280dcfe.zip |
Merge branch 'v3.6-rc7' into tty-next
This is to sync up on Linus's branch to get the other tty and core changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media/video/gspca/kinect.c')
0 files changed, 0 insertions, 0 deletions