From: David S. Miller <davem@davemloft.net>
Date: Mon, 1 Mar 2010 03:23:06 +0000 (-0800)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Tag: v2.6.34-rc1~233^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47871889c601d8199c51a4086f77eebd77c29b0b;p=platform%2Fkernel%2Flinux-3.10.git

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

Conflicts:
	drivers/firmware/iscsi_ibft.c
---

47871889c601d8199c51a4086f77eebd77c29b0b
diff --cc drivers/firmware/iscsi_ibft.c
index 5aeb3b5,f82bcda..a3600e3
--- a/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/pci/Makefile
index b2f6d77,8674c1e..3d102dd
--- a/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