alistair23-linux/drivers/platform/x86
Linus Torvalds 475c77edf8 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
Pull PCI changes (including maintainer change) from Jesse Barnes:
 "This pull has some good cleanups from Bjorn and Yinghai, as well as
  some more code from Yinghai to better handle resource re-allocation
  when enabled.

  There's also a new initcall_debug feature from Arjan which will print
  out quirk timing information to help identify slow quirks for fixing
  or refinement (Yinghai sent in a few patches to do just that once the
  new debug code landed).

  Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
  He's been a core PCI and Linux contributor for some time now, and has
  kindly volunteered to take over.  I just don't feel I have the time
  for PCI review and work that it deserves lately (I've taken on some
  other projects), and haven't been as responsive lately as I'd like, so
  I approached Bjorn asking if he'd like to manage things.  He's going
  to give it a try, and I'm confident he'll do at least as well as I
  have in keeping the tree managed, patches flowing, and keeping things
  stable."

Fix up some fairly trivial conflicts due to other cleanups (mips device
resource fixup cleanups clashing with list handling cleanup, ppc iseries
removal clashing with pci_probe_only cleanup etc)

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
  PCI: Bjorn gets PCI hotplug too
  PCI: hand PCI maintenance over to Bjorn Helgaas
  unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
  sparc/PCI: convert devtree and arch-probed bus addresses to resource
  powerpc/PCI: allow reallocation on PA Semi
  powerpc/PCI: convert devtree bus addresses to resource
  powerpc/PCI: compute I/O space bus-to-resource offset consistently
  arm/PCI: don't export pci_flags
  PCI: fix bridge I/O window bus-to-resource conversion
  x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
  PCI / PCIe: Introduce command line option to disable ARI
  PCI: make acpihp use __pci_remove_bus_device instead
  PCI: export __pci_remove_bus_device
  PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
  PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
  PCI: print out PCI device info along with duration
  PCI: Move "pci reassigndev resource alignment" out of quirks.c
  PCI: Use class for quirk for usb host controller fixup
  PCI: Use class for quirk for ti816x class fixup
  PCI: Use class for quirk for intel e100 interrupt fixup
  ...
2012-03-23 14:02:12 -07:00
..
acer-wmi.c acer-wmi: No wifi rfkill on Lenovo machines 2012-03-12 09:58:02 -04:00
acerhdf.c acerhdf.c: spaces in aliased changed to * 2011-08-05 15:21:51 -04:00
amilo-rfkill.c x86: Add amilo-rfkill driver for some Fujitsu-Siemens Amilo laptops 2012-03-12 09:56:47 -04:00
asus-laptop.c switch ->is_visible() to returning umode_t 2012-01-03 22:54:55 -05:00
asus-nb-wmi.c asus-wmi: add CWAP support and clarify the meaning of WAPF bits 2011-08-05 14:46:04 -04:00
asus-wmi.c PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device 2012-02-27 12:12:18 -08:00
asus-wmi.h asus-wmi: add CWAP support and clarify the meaning of WAPF bits 2011-08-05 14:46:04 -04:00
asus_acpi.c switch procfs to umode_t use 2012-01-03 22:54:56 -05:00
classmate-laptop.c backlight: add backlight type 2011-03-22 17:43:59 -07:00
compal-laptop.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
dell-laptop.c platform/x86: fix dell-laptop function prototypes 2011-11-17 10:29:02 -02:00
dell-wmi-aio.c dell: Convert printks to pr_<level> 2011-05-27 12:35:47 -04:00
dell-wmi.c dell-wmi: Add keys for Dell XPS L502X 2011-08-05 15:21:47 -04:00
eeepc-laptop.c PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device 2012-02-27 12:12:18 -08:00
eeepc-wmi.c asus-wmi: add CWAP support and clarify the meaning of WAPF bits 2011-08-05 14:46:04 -04:00
fujitsu-laptop.c fujitsu-laptop: Convert printks to pr_<level> 2011-05-27 12:35:47 -04:00
fujitsu-tablet.c Fujitsu tablet extras driver 2012-03-12 09:57:52 -04:00
hdaps.c hdaps: fix for -Wuninitialized 2012-02-03 23:19:47 +01:00
hp-wmi.c hp-wmi: fix use after free 2011-07-11 09:52:35 -04:00
hp_accel.c Merge branch 'akpm' (Andrew's incoming) 2011-10-31 17:46:07 -07:00
ibm_rtl.c asm-generic: architecture independent readq/writeq for 32bit environment 2012-02-21 16:47:28 -08:00
ideapad-laptop.c switch ->is_visible() to returning umode_t 2012-01-03 22:54:55 -05:00
intel_ips.c asm-generic: architecture independent readq/writeq for 32bit environment 2012-02-21 16:47:28 -08:00
intel_ips.h drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915. 2010-12-23 09:51:36 +00:00
intel_menlow.c switch sysfs attr->mode to umode_t 2012-01-03 22:54:55 -05:00
intel_mid_powerbtn.c x86/mid/powerbtn: Use MSIC read/write instead of ipc_scu 2012-03-06 09:01:26 +01:00
intel_mid_thermal.c x86/mid/thermal: Turn off thermistor 2012-03-06 09:01:26 +01:00
intel_oaktrail.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
intel_pmic_gpio.c intel_pmic_gpio: Convert printks to pr_<level> 2011-05-27 12:35:50 -04:00
intel_scu_ipc.c x86/mid/scu_ipc: Remove Moorestown support 2012-03-06 09:01:25 +01:00
intel_scu_ipcutil.c x86/mid/scu_ipc: Remove Moorestown support 2012-03-06 09:01:25 +01:00
Kconfig Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-22 09:43:22 -07:00
Makefile Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-03-22 09:43:22 -07:00
msi-laptop.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
msi-wmi.c x86: fix up files really needing to include module.h 2011-10-31 19:30:36 -04:00
mxm-wmi.c mxm/wmi: add MXMX interface entry point. 2011-05-09 11:40:38 +10:00
panasonic-laptop.c panasonic-laptop: avoid overflow in acpi_pcc_hotkey_add() 2012-03-12 10:25:51 -04:00
samsung-laptop.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
samsung-q10.c platform-drivers-x86: samsung-q10: make dmi_check_callback return 1 2011-08-05 15:21:47 -04:00
sony-laptop.c sony-laptop:irq: Remove IRQF_DISABLED 2011-10-24 16:52:42 +02:00
tc1100-wmi.c tc1100-wmi: Add pr_fmt, use pr_<level> 2011-05-27 12:35:51 -04:00
thinkpad_acpi.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
topstar-laptop.c topstar-latop: ignore 0x82 event 2011-10-24 16:52:37 +02:00
toshiba_acpi.c toshiba_acpi: Fix machines that don't support HCI_SYSTEM_EVENT 2011-12-05 13:07:28 -05:00
toshiba_bluetooth.c toshiba: Convert printks to pr_<level> 2011-05-27 12:35:52 -04:00
wmi.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
xo1-rfkill.c Add OLPC XO-1 rfkill driver 2010-10-21 10:10:44 -04:00
xo15-ebook.c xo15-ebook: Use pr_<level> 2011-05-27 12:35:53 -04:00