summaryrefslogtreecommitdiff
path: root/include/net/phonet
ModeNameSize
-rw-r--r--gprs.h1098logplain
-rw-r--r--pep.h3808logplain
-rw-r--r--phonet.h3352logplain
-rw-r--r--pn_dev.h1959logplain
t.git/commit/net/bridge/br_input.c?id=76e0e70e6452b971a69cc9794ff4a6715c11f7f2'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_input.c')