Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (44 commits)
  qlge: Fix sparse warnings for tx ring indexes.
  qlge: Fix sparse warning regarding rx buffer queues.
  qlge: Fix sparse endian warning in ql_hw_csum_setup().
  qlge: Fix sparse endian warning for inbound packet control block flags.
  qlge: Fix sparse warnings for byte swapping in qlge_ethool.c
  myri10ge: print MAC and serial number on probe failure
  pkt_sched: cls_u32: Fix locking in u32_change()
  iucv: fix cpu hotplug
  af_iucv: Free iucv path/socket in path_pending callback
  af_iucv: avoid left over IUCV connections from failing connects
  af_iucv: New error return codes for connect()
  net/ehea: bitops work on unsigned longs
  Revert "net: Fix for initial link state in 2.6.28"
  tcp: Kill extraneous SPLICE_F_NONBLOCK checks.
  tcp: don't mask EOF and socket errors on nonblocking splice receive
  dccp: Integrate the TFRC library with DCCP
  dccp: Clean up ccid.c after integration of CCID plugins
  dccp: Lockless integration of CCID congestion-control plugins
  qeth: get rid of extra argument after printk to dev_* conversion
  qeth: No large send using EDDP for HiperSockets.
  ...

diff --combined firmware/Makefile
index 6968388818be797e34f4c49c5ce879fd5a262698,0e432843db74fa52472f5bd10e5127c9ab90b6cc..d872b7942a30384a64896eaaac17dea128effaa8
--- 1/firmware/Makefile
--- 2/firmware/Makefile
+++ b/firmware/Makefile
@@@ -20,6 -20,15 +20,15 @@@ fw-external-y := $(subst ",,$(CONFIG_EX
  # accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
  # But be aware that the config file might not be included at all.
  
+ ifdef CONFIG_ACENIC_OMIT_TIGON_I
+ acenic-objs := acenic/tg2.bin
+ fw-shipped- += acenic/tg1.bin
+ else
+ acenic-objs := acenic/tg1.bin acenic/tg2.bin
+ endif
+ fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)
+ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
+                                        adaptec/starfire_tx.bin
  fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
  fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
  fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
@@@ -38,6 -47,8 +47,8 @@@ fw-shipped-$(CONFIG_SND_SB16_CSP) += sb
                                     sb16/ima_adpcm_capture.csp
  fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
                                   yamaha/ds1e_ctrl.fw
+ fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
+                              tigon/tg3_tso5.bin
  fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
  fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
                                  emi26/bitstream.fw
@@@ -150,15 -161,27 +161,15 @@@ $(patsubst %,$(obj)/%.gen.o, $(fw-exter
  $(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
        $(call cmd,ihex)
  
 -# Don't depend on ihex2fw if we're installing and it already exists.
 -# Putting it after | in the dependencies doesn't seem sufficient when
 -# we're installing after a cross-compile, because ihex2fw has dependencies
 -# on stuff like /usr/lib/gcc/ppc64-redhat-linux/4.3.0/include/stddef.h and 
 -# thus wants to be rebuilt. Which it can't be, if the prebuilt kernel tree
 -# is exported read-only for someone to run 'make install'.
 -ifeq ($(INSTALL):$(wildcard $(obj)/ihex2fw),install:$(obj)/ihex2fw)
 -ihex2fw_dep :=
 -else
 -ihex2fw_dep := $(obj)/ihex2fw
 -endif
 -
  # .HEX is also Intel HEX, but where the offset and length in each record
  # is actually meaningful, because the firmware has to be loaded in a certain
  # order rather than as a single binary blob. Thus, we convert them into our
  # more compact binary representation of ihex records (<linux/ihex.h>)
 -$(obj)/%.fw: $(obj)/%.HEX $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %)
 +$(obj)/%.fw: $(obj)/%.HEX $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
        $(call cmd,ihex2fw)
  
  # .H16 is our own modified form of Intel HEX, with 16-bit length for records.
 -$(obj)/%.fw: $(obj)/%.H16 $(ihex2fw_dep) | $(objtree)/$(obj)/$$(dir %)
 +$(obj)/%.fw: $(obj)/%.H16 $(obj)/ihex2fw | $(objtree)/$(obj)/$$(dir %)
        $(call cmd,h16tofw)
  
  $(firmware-dirs):