diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-06-05 00:34:22 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-06-05 00:34:22 -0400 |
| commit | 943079e111bde93ed972d21618d1d73e75ba0d09 (patch) | |
| tree | 32626f38001c6fd69340fe44a296ae34760872fa /drivers/acpi/scan.c | |
| parent | ec7fdeee19474afb2169bb0939cbc972f9aa20eb (diff) | |
| parent | 53d3b4d7778daf15900867336c85d3f8dd70600c (diff) | |
Merge tag 'drm-intel-fixes-2013-06-04' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
Daniel writes:
Three regression fixes and one no-lvds quirk update. The regression Egbert
Eich tracked down goes back to 2.6.37 ... ugh. The other two are pretty
minor: One bogus modeset state checker WARN and a patch to prevent X
dying in a SIGBUS after a gpu hang with failed (or not implement as on
gen2/3) gpu reset.
* tag 'drm-intel-fixes-2013-06-04' of git://people.freedesktop.org/~danvet/drm-intel: (368 commits)
drm/i915/sdvo: Use &intel_sdvo->ddc instead of intel_sdvo->i2c for DDC.
drm/i915: no lvds quirk for hp t5740
drm/i915: Quirk the pipe A quirk in the modeset state checker
drm/i915: Fix spurious -EIO/SIGBUS on wedged gpus
Linux 3.10-rc4
parisc: parport0: fix this legacy no-device port driver!
parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture
parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
parisc/PCI: Set type for LBA bus_num resource
MAINTAINERS: update parisc architecture file list
parisc: kernel: using strlcpy() instead of strcpy()
parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000"
parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50
parisc: memory overflow, 'name' length is too short for using
powerpc/cputable: Fix typo on P7+ cputable entry
powerpc/perf: Add missing SIER support
powerpc/perf: Revert to original NO_SIPR logic
powerpc/pci: Remove the unused variables in pci_process_bridge_OF_ranges
powerpc/pci: Remove the stale comments of pci_process_bridge_OF_ranges
powerpc/pseries: Always enable CONFIG_HOTPLUG_CPU on PSERIES SMP
...
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index c1bc608339a6..44225cb15f3a 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -2043,7 +2043,6 @@ int __init acpi_scan_init(void) | |||
| 2043 | acpi_pci_link_init(); | 2043 | acpi_pci_link_init(); |
| 2044 | acpi_platform_init(); | 2044 | acpi_platform_init(); |
| 2045 | acpi_lpss_init(); | 2045 | acpi_lpss_init(); |
| 2046 | acpi_csrt_init(); | ||
| 2047 | acpi_container_init(); | 2046 | acpi_container_init(); |
| 2048 | acpi_memory_hotplug_init(); | 2047 | acpi_memory_hotplug_init(); |
| 2049 | 2048 | ||