Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 0df5f6f75edf..16be41446b5b 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -135,6 +135,7 @@ config IA64_GENERIC
           HP-zx1/sx1000         For HP systems
           HP-zx1/sx1000+swiotlb For HP systems with (broken) DMA-constrained devices.
           SGI-SN2               For SGI Altix systems
+          SGI-UV                For SGI UV systems
           Ski-simulator         For the HP simulator <http://www.hpl.hp.com/research/linux/ski/>
 
           If you don't know what to do, choose "generic".
@@ -170,6 +171,18 @@ config IA64_SGI_SN2
           to select this option.  If in doubt, select ia64 generic support
           instead.
 
+config IA64_SGI_UV`
+        bool "SGI-UV`"
+        select NUMA
+        select ACPI_NUMA
+        select SWIOTLB
+        help
+          Selecting this option will optimize the kernel for use on UV based
+          systems, but the resulting kernel binary will not run on other
+          types of ia64 systems.  If you have an SGI UV system, it's safe
+          to select this option.  If in doubt, select ia64 generic support
+          instead.
+
 config IA64_HP_SIM
         bool "Ski-simulator"
         select SWIOTLB