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

	drivers/net/wireless/ath9k/core.c
	drivers/net/wireless/ath9k/main.c
	net/core/dev.c
2008-10-01 06:12:56 -07:00
..
9p
9p: fix put_data error handling
2008-09-24 16:22:22 -05:00
802
list_for_each_rcu must die: networking
2008-07-25 10:53:27 -07:00
8021q
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
appletalk
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
atm
net/atm/lec.c: drop code after return
2008-09-22 19:24:45 -07:00
ax25
AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
2008-08-05 18:46:57 -07:00
bluetooth
[Bluetooth] Fix regression from using default link policy
2008-09-12 03:11:54 +02:00
bridge
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2008-09-08 16:59:05 -07:00
can
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
core
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-01 06:12:56 -07:00
dccp
This reverts "Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/dccp_exp"
2008-09-09 13:27:22 +02:00
decnet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
econet
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
ethernet
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
ieee80211
net/ieee80211: adjust error handling
2008-08-22 16:29:49 -04:00
ipv4
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-01 06:12:56 -07:00
ipv6
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-01 06:12:56 -07:00
ipx
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
irda
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-07-20 17:43:29 -07:00
iucv
iucv: Fix mismerge again.
2008-09-30 03:03:35 -07:00
key
af_key: Free dumping state on socket close
2008-10-01 05:17:54 -07:00
lapb
…
llc
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
mac80211
Fix modpost failure when rx handlers are not inlined.
2008-09-30 14:07:25 -04:00
netfilter
netfilter: xt_time gives a wrong monthday in a leap year
2008-09-22 19:02:36 -07:00
netlabel
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
netlink
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
netrom
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
packet
net: convert BUG_TRAP to generic WARN_ON
2008-07-25 21:43:18 -07:00
phonet
Phonet: Netlink factorization and cleanup
2008-09-30 02:51:18 -07:00
rfkill
rfkill: remove transmitter blocking on suspend
2008-09-15 16:48:25 -04:00
rose
netdev: Handle ->addr_list_lock just like ->_xmit_lock for lockdep.
2008-07-22 14:16:42 -07:00
rxrpc
net/rxrpc: Use an IS_ERR test rather than a NULL test
2008-08-13 02:40:48 -07:00
sched
pkt_sched: Check the state of tx_queue in dequeue_skb()
2008-09-22 22:16:23 -07:00
sctp
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-01 06:12:56 -07:00
sunrpc
net: Use hton[sl]() instead of __constant_hton[sl]() where applicable
2008-09-20 22:20:49 -07:00
tipc
tipc: Don't use structure names which easily globally conflict.
2008-09-02 23:38:32 -07:00
unix
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
2008-07-26 20:23:44 -07:00
wanrouter
wanmain.c doesn't need syncppp.h
2008-07-23 23:00:36 +02:00
wireless
wireless: a global static to local static improvement
2008-09-24 16:18:04 -04:00
x25
netns: Use net_eq() to compare net-namespaces for optimization.
2008-07-19 22:34:43 -07:00
xfrm
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2008-10-01 06:12:56 -07:00
compat.c
flag parameters: paccept
2008-07-24 10:47:27 -07:00
Kconfig
Phonet: add CONFIG_PHONET
2008-09-22 20:03:00 -07:00
Makefile
Phonet: add CONFIG_PHONET
2008-09-22 20:03:00 -07:00
nonet.c
…
socket.c
sys_paccept: disable paccept() until API design is resolved
2008-09-23 08:09:14 -07:00
sysctl_net.c
missing bits of net-namespace / sysctl
2008-07-27 09:45:34 -07:00
TUNABLE
…