Merge branch 'master'

diff --cc Documentation/feature-removal-schedule.txt
index 2be7148,4d4897c..b47fba5
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -148,9 -148,17 +148,24 @@@ Why:     The 8250 serial driver now has th
        brother on Alchemy SOCs.  The loss of features is not considered an
        issue.
  Who:  Ralf Baechle <ralf@linux-mips.org>
+ 
  ---------------------------
  
 +What:   eepro100 network driver
 +When:   January 2007
 +Why:    replaced by the e100 driver
 +Who:    Adrian Bunk <bunk@stusta.de>
++
++---------------------------
++
+ What: Legacy /proc/pci interface (PCI_LEGACY_PROC)
+ When: March 2006
+ Why:  deprecated since 2.5.53 in favor of lspci(8)
+ Who:  Adrian Bunk <bunk@stusta.de>
+ 
+ ---------------------------
+ 
+ What: pci_module_init(driver)
+ When: January 2007
+ Why:  Is replaced by pci_register_driver(pci_driver).
+ Who:  Richard Knutsson <ricknu-0@student.ltu.se> and Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/net/3c59x.c
Simple merge

diff --cc drivers/net/wireless/ipw2200.c
index 734d2cb,14beab4..0702f0e
--- 1/drivers/net/wireless/ipw2200.c
--- 2/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@@ -2461,9 -2454,9 +2461,9 @@@ static void ipw_eeprom_init_sram(struc
        /*
           If the data looks correct, then copy it to our private
           copy.  Otherwise let the firmware know to perform the operation
 -         on it's own
 +         on its own.
         */
-       if ((priv->eeprom + EEPROM_VERSION) != 0) {
+       if (priv->eeprom[EEPROM_VERSION] != 0) {
                IPW_DEBUG_INFO("Writing EEPROM data into SRAM\n");
  
                /* write the eeprom data to sram */

diff --cc net/Kconfig
Simple merge

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

diff --cc net/socket.c
Simple merge