diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 09:52:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 09:52:07 -0700 |
| commit | 6072a93b98e660211c4b46a8381833425bdcf7b7 (patch) | |
| tree | 36e9cec650b5434f6889dddb2fe42da062b88a51 /include/linux/platform_data/serial-omap.h | |
| parent | 3f490f7f99053288bd85563f8d9b5032b810e177 (diff) | |
| parent | cfa805f6f19639b37ee877085770a396b70f2da1 (diff) | |
| download | blackbird-obmc-linux-6072a93b98e660211c4b46a8381833425bdcf7b7.tar.gz blackbird-obmc-linux-6072a93b98e660211c4b46a8381833425bdcf7b7.zip | |
Merge tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm updates from David Teigland:
"This set includes a number of SCTP related fixes in the dlm, and a few
other minor fixes and changes."
* tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: Avoid LVB truncation
dlm: log an error for unmanaged lockspaces
dlm: config: using strlcpy instead of strncpy
dlm: remove duplicated include from lowcomms.c
dlm: disable nagle for SCTP
dlm: retry failed SCTP sends
dlm: try other IPs when sctp init assoc fails
dlm: clear correct bit during sctp init failure handling
dlm: set sctp assoc id during setup
dlm: clear correct init bit during sctp setup
Diffstat (limited to 'include/linux/platform_data/serial-omap.h')
0 files changed, 0 insertions, 0 deletions
