1
0
Fork 0
alistair23-linux/drivers/misc/sgi-xp
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 sgi-xp: only build for ia64-sn2 when CONFIG_IA64_GENERIC specified 2008-10-30 11:38:46 -07:00
xp.h Merge branch 'linus' into x86/uv 2008-11-20 09:02:39 +01:00
xp_main.c sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect() 2008-11-05 20:32:20 -08:00
xp_nofault.S [IA64] run some drivers/misc/sgi-xp through scripts/Lindent 2008-04-22 15:08:29 -07:00
xp_sn2.c sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect() 2008-11-05 20:32:20 -08:00
xp_uv.c sgi-xp: define xp_partition_id and xp_region_size 2008-11-05 20:32:21 -08:00
xpc.h sgi-xp: create activate and notify gru message queues 2008-11-05 20:32:20 -08:00
xpc_channel.c sgi-xp: setup the notify GRU message queue 2008-07-30 09:41:50 -07:00
xpc_main.c sgi-xp: only build for ia64-sn2 when CONFIG_IA64_GENERIC specified 2008-10-30 11:38:46 -07:00
xpc_partition.c sgi-xp: setup the activate GRU message queue 2008-07-30 09:41:50 -07:00
xpc_sn2.c sgi-xp: define xp_expand_memprotect() and xp_restrict_memprotect() 2008-11-05 20:32:20 -08:00
xpc_uv.c sgi-xp: xpc needs to pass the physical address, not virtual 2008-12-16 23:04:24 +01:00
xpnet.c sgi-xp: Kill directly reference of netdev->priv 2008-12-04 15:12:20 -08:00