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-09-11 12:54:23 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 23:07:36 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:02:11 -07:00
2009-09-07 01:56:41 -07:00
2009-09-01 17:40:26 -07:00
2009-09-04 02:16:16 -07:00
2009-09-01 01:14:07 -07:00
2009-09-14 10:37:28 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:19:25 -07:00
2009-09-02 23:45:58 -07:00
2009-09-03 20:02:12 -07:00
2009-09-03 20:02:11 -07:00
2009-09-02 23:07:36 -07:00
2009-09-02 00:32:56 -07:00
2009-09-01 01:13:52 -07:00
2009-09-03 20:01:55 -07:00
2009-09-02 00:32:56 -07:00
2009-09-14 10:37:28 -07:00
2009-09-01 01:14:07 -07:00
2009-09-11 16:58:51 -07:00
2009-09-03 20:02:12 -07:00
2009-09-11 12:54:38 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 01:03:33 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:13:26 -07:00
2009-09-03 20:02:11 -07:00
2009-09-11 12:55:10 -07:00
2009-09-02 23:07:36 -07:00
2009-09-11 12:54:30 -07:00
2009-09-11 12:54:55 -07:00
2009-09-09 11:25:27 -04:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-04 03:41:07 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:13:50 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-03 20:02:11 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 17:40:56 -07:00
2009-09-09 11:19:03 -04:00
2009-09-02 01:03:33 -07:00
2009-09-03 20:02:11 -07:00
2009-09-02 00:32:56 -07:00
2009-09-02 01:03:33 -07:00
2009-09-03 20:02:11 -07:00
2009-08-15 18:50:47 -07:00
2009-09-02 00:32:56 -07:00
2009-08-15 18:50:44 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 23:07:36 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-09 18:54:49 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:13:40 -07:00
2009-09-02 00:32:56 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:13:40 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 23:07:36 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-08-23 19:51:03 -07:00
2009-09-02 23:46:06 -07:00
2009-09-01 01:14:07 -07:00
2009-09-14 10:37:28 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-07 01:56:52 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:13:40 -07:00
2009-09-02 01:03:33 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 00:32:56 -07:00
2009-09-02 01:03:33 -07:00
2009-09-02 01:03:33 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 01:03:33 -07:00
2009-09-03 20:02:13 -07:00
2009-08-20 02:52:16 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:02:11 -07:00
2009-09-11 12:54:49 -07:00
2009-09-03 20:02:11 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-09 01:41:30 -07:00
2009-09-01 01:14:07 -07:00
2009-09-03 20:02:11 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:13:40 -07:00
2009-09-02 01:03:33 -07:00
2009-09-02 01:03:33 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-07 02:03:37 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-08-30 22:35:11 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-08-29 00:19:35 -07:00
2009-08-29 00:19:35 -07:00
2009-09-01 01:14:07 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:02:11 -07:00
2009-09-03 20:02:11 -07:00
2009-09-01 17:40:44 -07:00
2009-09-01 01:13:40 -07:00
2009-09-02 00:32:56 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 23:07:36 -07:00
2009-09-02 23:07:36 -07:00
2009-09-01 01:14:07 -07:00
2009-09-01 01:14:07 -07:00
2009-09-03 20:02:11 -07:00
2009-09-01 01:14:07 -07:00
2009-09-02 01:03:33 -07:00
2009-09-11 16:50:16 -07:00
2009-09-02 00:44:09 -07:00
2009-09-03 20:02:11 -07:00
2009-09-14 10:37:28 -07:00
2009-09-01 01:14:07 -07:00
2009-08-30 21:51:47 -07:00
2009-09-11 12:54:45 -07:00
2009-08-30 21:51:47 -07:00
2009-09-02 01:03:33 -07:00
2009-09-02 00:32:56 -07:00
2009-09-03 20:02:11 -07:00
2009-09-02 01:03:33 -07:00
2009-09-02 01:03:33 -07:00
2009-09-02 23:07:36 -07:00
2009-09-03 20:02:11 -07:00
2009-09-01 01:14:07 -07:00