1
0
Fork 0
alistair23-linux/net/rose
Linus Torvalds 0191b625ca 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: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
2008-12-28 12:49:40 -08:00
..
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
af_rose.c Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
rose_dev.c [ROSE]: Trivial compilation CONFIG_INET=n case 2007-12-05 05:37:28 -08:00
rose_in.c [ROSE]: Supress sparse warnings 2008-01-28 15:02:44 -08:00
rose_link.c [ROSE]: Eleminate HZ from ROSE kernel interfaces 2006-05-03 23:28:20 -07:00
rose_loopback.c [ROSE]: Fix rose.ko oops on unload 2007-10-07 23:44:17 -07:00
rose_out.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
rose_route.c rose: improving AX25 routing frames via ROSE network 2008-06-17 17:08:32 -07:00
rose_subr.c [PATCH] remove many unneeded #includes of sched.h 2007-02-14 08:09:54 -08:00
rose_timer.c [ROSE]: rose_heartbeat_expiry() locking fix 2005-10-31 16:41:45 -02:00
sysctl_net_rose.c net: '&' redux 2008-11-03 18:21:05 -08:00