Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
David S. Miller [Mon, 1 Mar 2010 03:23:06 +0000 (19:23 -0800)]
Conflicts:
drivers/firmware/iscsi_ibft.c

24 files changed:
1  2 
Documentation/feature-removal-schedule.txt
Documentation/kernel-parameters.txt
MAINTAINERS
arch/powerpc/configs/ppc64_defconfig
arch/powerpc/platforms/85xx/mpc85xx_mds.c
drivers/firmware/iscsi_ibft.c
drivers/media/dvb/dvb-core/dvb_net.c
drivers/net/au1000_eth.c
drivers/net/cpmac.c
drivers/net/mace.c
drivers/net/macmace.c
drivers/net/pcmcia/smc91c92_cs.c
drivers/pci/Makefile
drivers/pci/quirks.c
drivers/staging/octeon/ethernet.c
include/linux/pci.h
include/linux/rculist.h
include/linux/rtnetlink.h
net/core/dev.c
net/core/filter.c
net/core/rtnetlink.c
net/core/sock.c
net/ipv4/route.c
net/packet/af_packet.c

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -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;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge
Simple merge