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