diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:28:16 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-07 02:28:16 +0200 |
commit | 97a7729a5c2f01faa076f38a7ec010961b456823 (patch) | |
tree | d1aaecf81d1357b5920579347e6bb894b4bfe11c /drivers/uio | |
parent | serial: mxs-auart: set the FIFO size to DMA buffer size (diff) | |
parent | Linux 3.12-rc4 (diff) | |
download | linux-97a7729a5c2f01faa076f38a7ec010961b456823.tar.xz linux-97a7729a5c2f01faa076f38a7ec010961b456823.zip |
Merge 3.12-rc4 into tty-next
We want the tty fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/uio')
0 files changed, 0 insertions, 0 deletions