iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
08acd4f8af
linux/drivers/pnp
History
Linus Torvalds 08acd4f8af 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: (179 commits)
  ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
  acpi: fix section mismatch warning in pnpacpi
  intel_menlo: fix build warning
  ACPI: Cleanup: Remove unneeded, multiple local dummy variables
  ACPI: video - fix permissions on some proc entries
  ACPI: video - properly handle errors when registering proc elements
  ACPI: video - do not store invalid entries in attached_array list
  ACPI: re-name acpi_pm_ops to acpi_suspend_ops
  ACER_WMI/ASUS_LAPTOP: fix build bug
  thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
  ACPI: check a return value correctly in acpi_power_get_context()
  #if 0 acpi/bay.c:eject_removable_drive()
  eeepc-laptop: add hwmon fan control
  eeepc-laptop: add backlight
  eeepc-laptop: add base driver
  ACPI: thinkpad-acpi: bump up version to 0.20
  ACPI: thinkpad-acpi: fix selects in Kconfig
  ACPI: thinkpad-acpi: use a private workqueue
  ACPI: thinkpad-acpi: fluff really minor fix
  ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
  ...

Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.
2008-04-30 11:52:52 -07:00
..
isapnp Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2008-04-30 11:52:52 -07:00
pnpacpi Merge branch 'pnp' into release 2008-04-30 13:59:05 -04:00
pnpbios Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2008-04-30 11:52:52 -07:00
base.h PNP: make interfaces private to the PNP core 2008-04-29 03:22:30 -04:00
card.c PNP: add pnp_alloc_card() 2008-04-29 03:22:17 -04:00
core.c PNP: make pnp_resource_table private to PNP core 2008-04-29 03:22:27 -04:00
driver.c PNP: change pnp_add_id() to allocate its own pnp_id structures 2008-04-29 03:22:16 -04:00
interface.c PNP: make generic pnp_add_mem_resource() 2008-04-29 03:22:29 -04:00
Kconfig
Makefile PNP: use dev_info(), dev_err(), etc in core 2007-10-17 08:43:04 -07:00
manager.c PNP: add pnp_resource index for ISAPNP 2008-04-29 03:22:28 -04:00
quirks.c PNP: remove PNP_MAX_* uses 2008-04-29 03:22:26 -04:00
resource.c PNP: make generic pnp_add_mem_resource() 2008-04-29 03:22:29 -04:00
support.c PNP: convert assign, interface to use pnp_get_resource(), not pnp_resource_table 2008-04-29 03:22:26 -04:00
system.c PNP: remove PNP_MAX_* uses 2008-04-29 03:22:26 -04:00