]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40c9f61 84a1caf)
Merge branch 'v3.6-rc7' into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 19:32:42 +0000 (12:32 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 19:32:42 +0000 (12:32 -0700)
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>
1  2 
drivers/usb/serial/metro-usb.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/serial/metro-usb.c
Simple merge
Linux kernel for KaRo TX COM modules