diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 17:27:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-15 17:27:31 -0700 |
| commit | 93dd048dbde493fb1eb11cdc844be5fa9cd1c925 (patch) | |
| tree | da75e7e06297afefbd9b5e81ad9f3af743456aa0 /sound/usb/stream.c | |
| parent | 069915b94642b05c9b45fee36862157026b36614 (diff) | |
| parent | bc2df47a408f2d64cf81bcfd0f6e3e14c84cb0ab (diff) | |
Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux
Pull two nfsd bugfixes from J. Bruce Fields.
* 'for-3.5' of git://linux-nfs.org/~bfields/linux:
nfsd4: BUG_ON(!is_spin_locked()) no good on UP kernels
NFS: hard-code init_net for NFS callback transports
Diffstat (limited to 'sound/usb/stream.c')
0 files changed, 0 insertions, 0 deletions