diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 16:55:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-02 16:55:18 -0700 |
commit | da579dd6a180693368ade74b3ac38701d35f686e (patch) | |
tree | 21d02a66dd18ee9d902a2e9ee38c928586cb0feb /include/uapi/linux/usb/Kbuild | |
parent | fad01e866afdbe01a1f3ec06a39c3a8b9e197014 (diff) | |
parent | 9326c5ca0982f548cc08c0cffb14dcbd020f3d43 (diff) | |
download | blackbird-op-linux-da579dd6a180693368ade74b3ac38701d35f686e.tar.gz blackbird-op-linux-da579dd6a180693368ade74b3ac38701d35f686e.zip |
Merge tag 'staging-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver fixes from Greg KH:
"Here are some staging driver fixes for 3.15.
Three are for the speakup drivers (one fixes a regression caused in
3.15-rc, and the other two resolve a tty issue found by Ben Hutchings)
The comedi and r8192e_pci driver fixes also resolve reported issues"
* tag 'staging-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: r8192e_pci: fix htons error
Staging: speakup: Update __speakup_paste_selection() tty (ab)usage to match vt
Staging: speakup: Move pasting into a work item
staging: comedi: ni_daq_700: add mux settling delay
speakup: fix incorrect perms on speakup_acntsa.c
Diffstat (limited to 'include/uapi/linux/usb/Kbuild')
0 files changed, 0 insertions, 0 deletions