mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-30 16:18:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
efd0bf97deeddd9ba53daabfc470a1399c6b0b2d
linux/net
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
9p
net/9p: Convert net/9p protocol dumps to tracepoints
2011-10-24 11:13:12 -05:00
802
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
8021q
net: introduce and use netdev_features_t for device features sets
2011-11-16 17:43:10 -05:00
appletalk
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
atm
neigh: new unresolved queue limits
2011-11-14 00:47:54 -05:00
ax25
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
batman-adv
Merge branch 'batman-adv/maint' of git://git.open-mesh.org/linux-merge
2011-10-30 03:05:07 -04:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-11-17 13:11:43 -05:00
bridge
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
caif
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
can
can: remove references to berlios mailinglist
2011-10-17 19:22:46 -04:00
ceph
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
core
net: Remove all uses of LL_ALLOCATED_SPACE
2011-11-18 14:37:09 -05:00
dcb
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
dccp
net: rename sk_clone to sk_clone_lock
2011-11-08 17:07:07 -05:00
decnet
neigh: new unresolved queue limits
2011-11-14 00:47:54 -05:00
dns_resolver
KEYS: Improve /proc/keys
2011-03-17 11:59:32 +11:00
dsa
net: Fix files explicitly needing to include module.h
2011-10-31 19:30:28 -04:00
econet
net: Remove all uses of LL_ALLOCATED_SPACE
2011-11-18 14:37:09 -05:00
ethernet
net: don't clear IFF_XMIT_DST_RELEASE in ether_setup
2011-09-15 14:49:44 -04:00
ieee802154
net: Remove all uses of LL_ALLOCATED_SPACE
2011-11-18 14:37:09 -05:00
ipv4
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
ipv6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
ipx
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
irda
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
iucv
net: more accurate skb truesize
2011-10-13 16:05:07 -04:00
key
net: Remove casts of void *
2011-06-16 23:19:27 -04:00
l2tp
l2tp: fix l2tp_udp_recv_core()
2011-11-08 13:59:44 -05:00
lapb
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
llc
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
mac80211
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
netfilter
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
netlabel
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
2011-08-20 10:39:12 -07:00
netlink
af_unix: dont send SCM_CREDENTIALS by default
2011-09-28 13:29:50 -04:00
netrom
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
nfc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-11-17 13:11:43 -05:00
packet
packet: Add needed_tailroom to packet_sendmsg_spkt
2011-11-18 14:37:10 -05:00
phonet
Phonet: set the pipe handle using setsockopt
2011-11-18 14:37:40 -05:00
rds
rds: drop "select LLIST"
2011-11-14 00:10:50 -05:00
rfkill
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2011-11-17 13:11:43 -05:00
rose
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
rxrpc
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
sched
net: new counter for tx_timeout errors in sysfs
2011-11-16 23:14:02 -05:00
sctp
sctp: fasthandoff with ASCONF at server-node
2011-11-08 15:11:30 -05:00
sunrpc
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
tipc
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
unix
af_unix: dont send SCM_CREDENTIALS by default
2011-09-28 13:29:50 -04:00
wanrouter
wanrouter: Remove kernel_lock annotations
2011-11-07 13:27:30 -05:00
wimax
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
x25
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
xfrm
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
compat.c
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
Kconfig
NFC: add nfc subsystem core
2011-07-05 15:26:57 -04:00
Makefile
NFC: add nfc subsystem core
2011-07-05 15:26:57 -04:00
nonet.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
socket.c
net: add wireless TX status socket option
2011-11-09 16:01:02 -05:00
sysctl_net.c
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00