You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds d7e9660ad9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits) netxen: update copyright netxen: fix tx timeout recovery netxen: fix file firmware leak netxen: improve pci memory access netxen: change firmware write size tg3: Fix return ring size breakage netxen: build fix for INET=n cdc-phonet: autoconfigure Phonet address Phonet: back-end for autoconfigured addresses Phonet: fix netlink address dump error handling ipv6: Add IFA_F_DADFAILED flag net: Add DEVTYPE support for Ethernet based devices mv643xx_eth.c: remove unused txq_set_wrr() ucc_geth: Fix hangs after switching from full to half duplex ucc_geth: Rearrange some code to avoid forward declarations phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs drivers/net/phy: introduce missing kfree drivers/net/wan: introduce missing kfree net: force bridge module(s) to be GPL Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded ... Fixed up trivial conflicts: - arch/x86/include/asm/socket.h converted to <asm-generic/socket.h> in the x86 tree. The generic header has the same new #define's, so that works out fine. - drivers/net/tun.c fix conflict between 89f56d1e9 ("tun: reuse struct sock fields") that switched over to using 'tun->socket.sk' instead of the redundantly available (and thus removed) 'tun->sk', and 2b980dbd ("lsm: Add hooks to the TUN driver") which added a new 'tun->sk' use. Noted in 'next' by Stephen Rothwell.		16 years ago
..
9p	…
802	…
8021q	vlan: adds drops accounting	16 years ago
appletalk	Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded	16 years ago
atm	atm/br2684: netif_stop_queue() when atm device busy and netif_wake_queue() when we can send packets again.	16 years ago
ax25	…
bluetooth	net: Add DEVTYPE support for Ethernet based devices	16 years ago
bridge	net: Add DEVTYPE support for Ethernet based devices	16 years ago
can	…
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	16 years ago
dcb	…
dccp	inet: inet_connection_sock_af_ops const	16 years ago
decnet	…
dsa	…
econet	…
ethernet	…
ieee802154	…
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	16 years ago
ipv6	ipv6: Add IFA_F_DADFAILED flag	16 years ago
ipx	…
irda	net: file_operations should be const	16 years ago
iucv	…
key	net: file_operations should be const	16 years ago
lapb	…
llc	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
mac80211	net: Add DEVTYPE support for Ethernet based devices	16 years ago
netfilter	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	16 years ago
netlabel	…
netlink	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6	16 years ago
netrom	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
packet	…
phonet	Phonet: back-end for autoconfigured addresses	16 years ago
rds	…
rfkill	…
rose	…
rxrpc	…
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	16 years ago
sctp	sctp: Catch bogus stream sequence numbers	16 years ago
sunrpc	Merge branch 'nfs-for-2.6.32'	16 years ago
tipc	…
unix	net: unix: fix sending fds in multiple buffers	16 years ago
wanrouter	…
wimax	…
wireless	cfg80211: allow scanning on specified frequencies when using wext-compatibility	16 years ago
x25	…
xfrm	net: file_operations should be const	16 years ago
Kconfig	…
Makefile	…
TUNABLE	…
compat.c	…
nonet.c	…
socket.c	…
sysctl_net.c	…