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.
2009-09-14 10:37:28 -07:00
..
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-02-22 09:23:02 -08:00
2009-02-22 09:23:02 -08:00
2009-01-16 21:58:10 +10:00
2009-06-11 21:02:17 +02:00
2009-06-11 21:02:17 +02:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 21:02:14 +02:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:44 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:44 +10:00
2009-03-24 15:17:45 +10:00
2009-01-16 21:58:10 +10:00
2009-01-26 10:38:43 -08:00
2009-03-24 15:17:44 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-27 16:42:00 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:45 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:45 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:41 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:42 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-09-01 09:38:03 +02:00
2009-08-31 18:08:49 +02:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:44 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-05-29 08:40:02 -07:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:42 +10:00
2009-03-02 16:49:37 -05:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:42 +10:00
2009-01-16 21:58:10 +10:00
2009-03-27 12:46:23 +01:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-26 21:15:30 +01:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-26 10:33:01 -08:00
2009-01-16 21:58:10 +10:00
2009-06-16 19:47:51 -07:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 13:09:10 +10:00
2009-06-11 13:09:10 +10:00
2009-06-11 13:09:10 +10:00
2009-06-11 13:09:10 +10:00
2009-06-11 13:09:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-26 21:15:27 +01:00
2009-01-16 21:58:10 +10:00
2009-08-31 18:08:49 +02:00
2009-03-24 15:17:41 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 21:01:52 +02:00
2009-03-24 15:17:45 +10:00
2009-03-24 15:17:42 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:45 +10:00
2009-08-26 23:14:49 +02:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 21:02:17 +02:00
2009-06-11 21:02:17 +02:00
2009-03-24 15:17:43 +10:00
2009-01-16 21:58:10 +10:00
2009-03-16 17:52:16 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:41 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:43 +10:00
2009-08-26 23:14:49 +02:00
2009-03-24 15:17:43 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 13:09:11 +10:00
2009-01-16 21:58:10 +10:00
2009-03-17 08:44:42 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-04-02 01:05:31 +00:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:43 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:44 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-17 08:44:41 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-16 18:00:25 +10:00
2009-03-17 08:47:11 +10:00
2009-06-11 21:01:52 +02:00
2009-01-16 21:58:10 +10:00
2009-08-05 13:02:57 -07:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-07-27 12:10:38 -07:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 13:09:11 +10:00
2009-01-16 21:58:10 +10:00
2009-06-11 13:09:11 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-08-31 18:08:49 +02:00
2009-07-10 14:24:05 -07:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:42 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:45 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-03-24 15:17:43 +10:00
2009-03-24 15:17:43 +10:00
2009-08-26 23:14:50 +02:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00
2009-01-16 21:58:10 +10:00