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