2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 13:43:55 +08:00
linux-next/drivers/char/agp
Linus Torvalds 37224470c8 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits)
  ACPI: suppress power button event on S3 resume
  ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
  ACPI: use for_each_possible_cpu() instead of for_each_cpu()
  ACPI: delete newly added debugging macros in processor_perflib.c
  ACPI: UP build fix for bugzilla-5737
  Enable P-state software coordination via _PDC
  P-state software coordination for speedstep-centrino
  P-state software coordination for acpi-cpufreq
  P-state software coordination for ACPI core
  ACPI: create acpi_thermal_resume()
  ACPI: create acpi_fan_suspend()/acpi_fan_resume()
  ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend()
  ACPI: create acpi_device_suspend()/acpi_device_resume()
  ACPI: replace spin_lock_irq with mutex for ec poll mode
  ACPI: Allow a WAN module enable/disable on a Thinkpad X60.
  sem2mutex: acpi, acpi_link_lock
  ACPI: delete unused acpi_bus_drivers_lock
  sem2mutex: drivers/acpi/processor_perflib.c
  ACPI add ia64 exports to build acpi_memhotplug as a module
  ACPI: asus_acpi_init(): propagate correct return value
  ...

Manual resolve of conflicts in:

	arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
	arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
	include/acpi/processor.h
2006-06-23 07:52:36 -07:00
..
agp.h [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
ali-agp.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
alpha-agp.c [AGPGART] alpha-agp warning fix 2006-06-08 22:41:17 -04:00
amd64-agp.c [AGPGART] Fix Nforce3 suspend on amd64. 2006-05-21 17:11:42 -04:00
amd-k7-agp.c [PATCH] PCI: removed unneeded .owner field from struct pci_driver 2005-11-10 16:09:17 -08:00
ati-agp.c [AGPGART] ATI RS350 support. 2006-03-01 14:23:14 -05:00
backend.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
efficeon-agp.c [efficeon-agp] Add missing memory mask 2006-04-14 17:41:06 -07:00
frontend.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
generic.c [AGPGART] Remove pointless code from agp_generic_create_gatt_table() 2006-05-30 18:19:39 -04:00
hp-agp.c ACPI: ia64 buildfix 2006-04-01 23:45:39 -05:00
i460-agp.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
intel-agp.c [AGPGART] Remove pointless initialisation in intel-agp 2006-05-30 18:22:07 -04:00
isoch.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
Kconfig [PATCH] x86_64: use select for GART_IOMMU to enable AGP 2006-06-22 15:05:58 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nvidia-agp.c [PATCH] nvidia-agp: use time_before_eq() 2006-03-28 09:16:06 -08:00
sgi-agp.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
sis-agp.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
sworks-agp.c [AGPGART] Lots of CodingStyle/whitespace cleanups. 2006-02-28 00:54:25 -05:00
uninorth-agp.c [AGPGART] uninorth-agp warning fixes 2006-06-08 22:41:16 -04:00
via-agp.c [AGPGART] VIA PT880 Ultra support. 2006-05-22 13:56:02 -04:00