diff options
| author | Linus Torvalds | 2014-06-13 16:41:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2014-06-13 16:41:57 +0200 |
| commit | 4bdeb312083e65fccbb0a4b4043568f60520c67a (patch) | |
| tree | ed123e56179e3c28e37da57942bb3eabc7bebb3a /sound/pci/hda/hda_intel.c | |
| parent | Merge branch 'serge-next-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | dlm: keep listening connection alive with sctp mode (diff) | |
| download | kernel-qcow2-linux-4bdeb312083e65fccbb0a4b4043568f60520c67a.tar.gz kernel-qcow2-linux-4bdeb312083e65fccbb0a4b4043568f60520c67a.tar.xz kernel-qcow2-linux-4bdeb312083e65fccbb0a4b4043568f60520c67a.zip | |
Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm fix from David Teigland:
"This contains one small fix related to resending SCTP messages"
* tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: keep listening connection alive with sctp mode
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
0 files changed, 0 insertions, 0 deletions