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