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

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ar9170/usb.c
	drivers/scsi/iscsi_tcp.c
	net/ipv4/ipmr.c

diff --cc Documentation/feature-removal-schedule.txt
index a1c6e927798673621e05c5229bfdee6fd55e0df5,05df0b7514b6b884d38c545f8bb838cdfeb1d162..e592dade64200f2b182b7cc0e0d9bcd0f7de30bb
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -599,30 -591,24 +599,53 @@@ Why:    Useful in 2003, implementation is 
  Who:  Len Brown <len.brown@intel.com>
  
  ----------------------------
 +
 +What: iwlwifi 50XX module parameters
 +When: 2.6.40
 +Why:  The "..50" modules parameters were used to configure 5000 series and
 +      up devices; different set of module parameters also available for 4965
 +      with same functionalities. Consolidate both set into single place
 +      in drivers/net/wireless/iwlwifi/iwl-agn.c
 +
 +Who:  Wey-Yi Guy <wey-yi.w.guy@intel.com>
 +
 +----------------------------
 +
 +What: iwl4965 alias support
 +When: 2.6.40
 +Why:  Internal alias support has been present in module-init-tools for some
 +      time, the MODULE_ALIAS("iwl4965") boilerplate aliases can be removed
 +      with no impact.
 +
 +Who:  Wey-Yi Guy <wey-yi.w.guy@intel.com>
 +
 +---------------------------
 +
 +What: xt_NOTRACK
 +Files:        net/netfilter/xt_NOTRACK.c
 +When: April 2011
 +Why:  Superseded by xt_CT
 +Who:  Netfilter developer team <netfilter-devel@vger.kernel.org>
++
++---------------------------
+ 
+ What: video4linux /dev/vtx teletext API support
+ When: 2.6.35
+ Files:        drivers/media/video/saa5246a.c drivers/media/video/saa5249.c
+       include/linux/videotext.h
+ Why:  The vtx device nodes have been superseded by vbi device nodes
+       for many years. No applications exist that use the vtx support.
+       Of the two i2c drivers that actually support this API the saa5249
+       has been impossible to use for a year now and no known hardware
+       that supports this device exists. The saa5246a is theoretically
+       supported by the old mxb boards, but it never actually worked.
+ 
+       In summary: there is no hardware that can use this API and there
+       are no applications actually implementing this API.
+ 
+       The vtx support still reserves minors 192-223 and we would really
+       like to reuse those for upcoming new functionality. In the unlikely
+       event that new hardware appears that wants to use the functionality
+       provided by the vtx API, then that functionality should be build
+       around the sliced VBI API instead.
+ Who:  Hans Verkuil <hverkuil@xs4all.nl>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/arm/ep93xx_eth.c
Simple merge

diff --cc drivers/net/fec.c
Simple merge

diff --cc drivers/net/gianfar.c
Simple merge

diff --cc drivers/net/phy/micrel.c
Simple merge

diff --cc drivers/net/wireless/ath/ar9170/usb.c
index c8121a6a9d3a414daeb93f118525b4cffeb1b70a,e1c2fcaa8bed92889a3cc30d0dd8fcd6c3bffb00..8663660ea4c6c1bfcde72027c9d09ade71048155
--- 1/drivers/net/wireless/ath/ar9170/usb.c
--- 2/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@@ -738,12 -727,16 +738,16 @@@ static void ar9170_usb_firmware_failed(
  {
        struct device *parent = aru->udev->dev.parent;
  
+       complete(&aru->firmware_loading_complete);
+ 
        /* unbind anything failed */
        if (parent)
 -              down(&parent->sem);
 +              device_lock(parent);
        device_release_driver(&aru->udev->dev);
        if (parent)
 -              up(&parent->sem);
 +              device_unlock(parent);
+ 
+       usb_put_dev(aru->udev);
  }
  
  static void ar9170_usb_firmware_finish(const struct firmware *fw, void *context)

diff --cc include/linux/fs.h
Simple merge

diff --cc include/net/sctp/sm.h
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/ipmr.c
index f3f1c6b5c70cb9c355df6d33d58daf2fcff89d3d,ec19a890c9a0eb02ba9deec1b099422690e621c0..7a7ee1cc3b5a12d8fd45a20c4e30b2d202828672
--- 1/net/ipv4/ipmr.c
--- 2/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@@ -995,10 -750,12 +995,11 @@@ ipmr_cache_unresolved(struct mr_table *
                        return err;
                }
  
 -              atomic_inc(&net->ipv4.cache_resolve_queue_len);
 -              c->next = mfc_unres_queue;
 -              mfc_unres_queue = c;
 +              atomic_inc(&mrt->cache_resolve_queue_len);
 +              list_add(&c->list, &mrt->mfc_unres_queue);
  
-               mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
 -              if (atomic_read(&net->ipv4.cache_resolve_queue_len) == 1)
 -                      mod_timer(&ipmr_expire_timer, c->mfc_un.unres.expires);
++              if (atomic_read(&mrt->cache_resolve_queue_len) == 1)
++                      mod_timer(&mrt->ipmr_expire_timer, c->mfc_un.unres.expires);
        }
  
        /*

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc net/ipv6/datagram.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/sctp/sm_sideeffect.c
Simple merge

diff --cc net/sctp/transport.c
Simple merge