diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-29 12:04:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-29 12:04:10 -0700 |
| commit | bbf6c0a705d612a3e51c73280a2d6a608436abc6 (patch) | |
| tree | 99bce086b0790934d4e08b8bae9b3c62295c0859 /crypto/salsa20_generic.c | |
| parent | 7acaf5202a355547ca3b038bdf509ca450fa913b (diff) | |
| parent | a2fa6721c7237b5a666f16f732628c0c09c0b954 (diff) | |
Merge tag 'staging-3.17-rc3' 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 your tree. Nothing huge, just
some fixes for issues that have been reported and a few new device ids
added.
All have been in linux-next for a while"
* tag 'staging-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: r8188eu: Add new USB ID
staging/rtl8188eu: add 0df6:0076 Sitecom Europe B.V.
staging: android: fix a possible memory leak
staging: lustre: lustre: libcfs: workitem.c: Cleaning up missing null-terminate after strncpy call
staging: et131x: Fix errors caused by phydev->addr accesses before initialisation
staging: lustre: Remove circular dependency on header
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions