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-06-17 11:06:27 +01:00
2009-07-03 15:45:26 +01:00
2008-12-12 18:12:23 +00:00
2009-07-03 15:45:29 +01:00
2009-07-03 15:45:27 +01:00
2009-06-07 05:01:00 -07:00
2009-05-14 13:50:29 +01:00
2009-08-03 17:52:40 +01:00
2009-05-14 13:50:29 +01:00
2009-06-17 11:06:28 +01:00
2008-10-20 08:52:41 -07:00
2009-06-17 11:06:30 +01:00
2009-08-17 17:27:57 +01:00
2009-06-17 14:04:42 -07:00
2009-06-17 11:06:30 +01:00
2009-07-03 15:45:27 +01:00
2009-06-24 18:34:40 +01:00
2009-06-24 18:34:40 +01:00
2009-06-17 11:06:31 +01:00
2009-08-03 17:52:50 +01:00