hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
sst-linux/net
History
David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:

	drivers/message/fusion/mptlan.c
	drivers/net/sfc/ethtool.c
	net/mac80211/debugfs_sta.c
2008-11-11 15:43:02 -08:00
..
9p
net/9p: fix printk format warnings
2008-11-05 13:19:07 -06:00
802
net: '&' redux
2008-11-03 18:21:05 -08:00
8021q
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
appletalk
net: '&' redux
2008-11-03 18:21:05 -08:00
atm
net: struct device - replace bus_id with dev_name(), dev_set_name()
2008-11-10 13:55:14 -08:00
ax25
net: '&' redux
2008-11-03 18:21:05 -08:00
bluetooth
net: struct device - replace bus_id with dev_name(), dev_set_name()
2008-11-10 13:55:14 -08:00
bridge
net: '&' redux
2008-11-03 18:21:05 -08:00
can
net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)
2008-10-16 15:24:51 -07:00
core
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
dccp
dccp: Cleanup routines for feature negotiation
2008-11-04 23:56:30 -08:00
decnet
net: '&' redux
2008-11-03 18:21:05 -08:00
dsa
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
econet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ethernet
dsa: add support for Trailer tagging format
2008-10-08 17:24:16 -07:00
ieee80211
wireless: fix two bad print_ssid conversions
2008-11-10 15:17:33 -05:00
ipv4
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
ipv6
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
ipx
net: '&' redux
2008-11-03 18:21:05 -08:00
irda
net: '&' redux
2008-11-03 18:21:05 -08:00
iucv
iucv: Fix mismerge again.
2008-09-30 03:03:35 -07:00
key
af_key: mark policy as dead before destroying
2008-11-06 23:08:37 -08:00
lapb
…
llc
net: '&' redux
2008-11-03 18:21:05 -08:00
mac80211
mac80211: fix a buffer overrun in station debug code
2008-11-10 21:37:39 -08:00
netfilter
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
netlabel
net: replace NIPQUAD() in net/*/
2008-10-31 00:54:56 -07:00
netlink
netlink: constify struct nlattr * arg to parsing functions
2008-10-28 11:59:11 -07:00
netrom
net: '&' redux
2008-11-03 18:21:05 -08:00
packet
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
phonet
Phonet: use net_device built-in stats for GPRS
2008-11-10 16:21:05 -08:00
rfkill
net: struct device - replace bus_id with dev_name(), dev_set_name()
2008-11-10 13:55:14 -08:00
rose
net: '&' redux
2008-11-03 18:21:05 -08:00
rxrpc
net: replace NIPQUAD() in net/*/
2008-10-31 00:54:56 -07:00
sched
pkt_sched: Control group classifier
2008-11-07 22:56:00 -08:00
sctp
net: '&' redux
2008-11-03 18:21:05 -08:00
sunrpc
sunrpc: Fix build warning due to typo in %pI4 format changes.
2008-11-02 23:57:06 -08:00
tipc
tipc: trivial endian annotation in debug statement
2008-11-07 23:37:50 -08:00
unix
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-11 15:43:02 -08:00
wanrouter
wanmain.c doesn't need syncppp.h
2008-07-23 23:00:36 +02:00
wireless
net: struct device - replace bus_id with dev_name(), dev_set_name()
2008-11-10 13:55:14 -08:00
x25
net: '&' redux
2008-11-03 18:21:05 -08:00
xfrm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-06 22:43:03 -08:00
compat.c
flag parameters: paccept
2008-07-24 10:47:27 -07:00
Kconfig
netns: Coexist with the sysfs limitations v2
2008-10-27 17:51:47 -07:00
Makefile
net: Distributed Switch Architecture protocol support
2008-10-08 17:15:19 -07:00
nonet.c
…
socket.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-11-06 22:43:03 -08:00
sysctl_net.c
missing bits of net-namespace / sysctl
2008-07-27 09:45:34 -07:00
TUNABLE
…