David S. Miller
8decf86879
Merge branch 'master' of github.com:davem330/net
Conflicts:
MAINTAINERS
drivers/net/Kconfig
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
drivers/net/wireless/rt2x00/rt2800usb.c
drivers/net/wireless/wl12xx/main.c
|
2011-09-22 03:23:13 -04:00 |
| .. |
|
auth.h
|
[SCTP]: Stop claiming that this is a "reference implementation"
|
2008-02-05 10:59:07 -05:00 |
|
checksum.h
|
sctp: Clean up sctp checksumming code
|
2009-02-16 00:03:10 -08:00 |
|
command.h
|
sctp: deal with multiple COOKIE_ECHO chunks
|
2011-09-16 17:17:22 -04:00 |
|
constants.h
|
sctp: remove completely unsed EMPTY state
|
2011-04-20 01:51:03 -07:00 |
|
sctp.h
|
include/net: Remove unnecessary semicolons
|
2011-06-05 14:33:40 -07:00 |
|
sm.h
|
sctp: implement event notification SCTP_SENDER_DRY_EVENT
|
2011-04-21 10:35:44 -07:00 |
|
structs.h
|
sctp: Bundle HEAERTBEAT into ASCONF_ACK
|
2011-08-24 19:41:13 -07:00 |
|
tsnmap.h
|
net: return operator cleanup
|
2010-09-23 14:33:39 -07:00 |
|
ulpevent.h
|
sctp: ABORT if receive, reassmbly, or reodering queue is not empty while closing socket
|
2011-07-08 09:53:08 -07:00 |
|
ulpqueue.h
|
[SCTP]: Stop claiming that this is a "reference implementation"
|
2008-02-05 10:59:07 -05:00 |
|
user.h
|
sctp: Add socket option operation for Auto-ASCONF.
|
2011-06-02 02:04:53 -07:00 |