net/sctp/protocol.c · caea902f72b053fd0c76d0d3b6b2e057beb3fc64 · Kirill Smelkov / linux · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · caea902f
David S. Miller authored Jun 16, 2008
```
Conflicts:

	drivers/net/wireless/rt2x00/Kconfig
	drivers/net/wireless/rt2x00/rt2x00usb.c
	net/sctp/protocol.c
```
caea902f

protocol.c 36.6 KB