Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/configs/ppc64_defconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/mpc85xx_mds.c
Simple merge

diff --cc drivers/firmware/iscsi_ibft.c
index 5aeb3b541c804a04db0c696eefd3369b8215f444,f82bcdae130be1a2b8dfce439bbd2bffc09535cc..a3600e3ed0fa7a4f1f97330d4c2a972abb9d2303
--- 1/drivers/firmware/iscsi_ibft.c
--- 2/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@@ -380,7 -380,8 +380,7 @@@ static ssize_t ibft_attr_show_nic(struc
        struct ibft_nic *nic = entry->nic;
        void *ibft_loc = entry->header;
        char *str = buf;
-       int val;
 -      char *mac;
+       __be32 val;
  
        if (!nic)
                return 0;

diff --cc drivers/media/dvb/dvb-core/dvb_net.c
Simple merge

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

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

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

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

diff --cc drivers/net/pcmcia/smc91c92_cs.c
Simple merge

diff --cc drivers/pci/Makefile
index b2f6d777a084882da9f6de9c658de222feed0c6e,8674c1ebe979955165f5a5e64e4cccbb1af85d50..3d102dd87c9f84937e92eb29ac9dd1bb311c19ee
--- 1/drivers/pci/Makefile
--- 2/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -2,9 -2,9 +2,9 @@@
  # Makefile for the PCI bus specific drivers.
  #
  
- obj-y         += access.o bus.o probe.o remove.o pci.o quirks.o \
+ obj-y         += access.o bus.o probe.o remove.o pci.o \
                        pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \
 -                      irq.o
 +                      irq.o vpd.o
  obj-$(CONFIG_PROC_FS) += proc.o
  obj-$(CONFIG_SYSFS) += slot.o
  

diff --cc drivers/pci/quirks.c
Simple merge

diff --cc drivers/staging/octeon/ethernet.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/packet/af_packet.c
Simple merge