summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 20:00:57 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-29 20:00:57 +0400
commitca364d8388602b5c0d607c5452774833cc1ad667 (patch)
tree4c6aa0a71c89b813c73c112391005fc00e44841a /arch/um
parent84fd7bdf1266ee6228319903af7e58702745024d (diff)
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff)
downloadlinux-ca364d8388602b5c0d607c5452774833cc1ad667.tar.xz
Merge 3.7-rc3 into tty-next
This merges the tty changes in 3.7-rc3 into tty-next Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions