From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Sep 2009 16:57:08 +0000 (-0700)
Subject: Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v3.12-rc1~12731
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b7f21bb2e23b4fec16b448a34889f467465be659;p=kernel%2Fkernel-generic.git

Merge branch 'linux-next' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits)
  x86/PCI: make 32 bit NUMA node array int, not unsigned char
  x86/PCI: default pcibus cpumask to all cpus if it lacks affinity
  MAINTAINTERS: remove hotplug driver entries
  PCI: pciehp: remove slot capabilities definitions
  PCI: pciehp: remove error message definitions
  PCI: pciehp: remove number field
  PCI: pciehp: remove hpc_ops
  PCI: pciehp: remove pci_dev field
  PCI: pciehp: remove crit_sect mutex
  PCI: pciehp: remove slot_bus field
  PCI: pciehp: remove first_slot field
  PCI: pciehp: remove slot_device_offset field
  PCI: pciehp: remove hp_slot field
  PCI: pciehp: remove device field
  PCI: pciehp: remove bus field
  PCI: pciehp: remove slot_num_inc field
  PCI: pciehp: remove num_slots field
  PCI: pciehp: remove slot_list field
  PCI: fix VGA arbiter header file
  PCI: Disable AER with pci=nomsi
  ...

Fixed up trivial conflicts in MAINTAINERS
---

b7f21bb2e23b4fec16b448a34889f467465be659
diff --cc MAINTAINERS
index 0c138ba,5cbe07c..e797c4d
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4672,24 -4618,6 +4666,17 @@@ F:	drivers/serial/serial_lh7a40x.
  F:	drivers/usb/gadget/lh7a40*
  F:	drivers/usb/host/ohci-lh7a40*
  
- SHPC HOTPLUG DRIVER
- M:	Kristen Carlson Accardi <kristen.c.accardi@intel.com>
- L:	linux-pci@vger.kernel.org
- S:	Supported
- F:	drivers/pci/hotplug/shpchp*
- 
 +SIMPLE FIRMWARE INTERFACE (SFI)
 +P:	Len Brown
 +M:	lenb@kernel.org
 +L:	sfi-devel@simplefirmware.org
 +W:	http://simplefirmware.org/
 +T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git
 +S:	Supported
 +F:	arch/x86/kernel/*sfi*
 +F:	drivers/sfi/
 +F:	include/linux/sfi*.h
 +
- 
  SIMTEC EB110ATX (Chalice CATS)
  P:	Ben Dooks
  M:	Vincent Sanders <support@simtec.co.uk>