summaryrefslogtreecommitdiff
path: root/drivers/tty/synclinkmp.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 12:32:42 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 12:32:42 -0700
commit467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (patch)
tree68096d5b17e884d270420d50e466186c73019830 /drivers/tty/synclinkmp.c
parent40c9f61eae9098212b6906f29f30f08f7a19b5e2 (diff)
parent84a1caf1453c3d44050bd22db958af4a7f99315c (diff)
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/tty/synclinkmp.c')
0 files changed, 0 insertions, 0 deletions