UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/acpi
History
Linus Torvalds d910fc7860 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight 
* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: new driver for ADP5520/ADP5501 MFD PMICs
  backlight: extend event support to also support poll()
  backlight/eeepc-laptop: Update the backlight state when we change brightness
  backlight/acpi: Update the backlight state when we change brightness
  backlight: Allow drivers to update the core, and generate events on changes
  backlight: switch to da903x driver to dev_pm_ops
  backlight: Add support for the Avionic Design Xanthos backlight device.
  backlight: spi driver for LMS283GF05 LCD
  backlight: move hp680-bl's probe function to .devinit.text
  backlight: Add support for new Apple machines.
  backlight: mbp_nvidia_bl: add support for MacBookAir 1,1
  backlight: Add WM831x backlight driver

Trivial conflicts due to '#ifdef CONFIG_PM' differences in
drivers/video/backlight/da903x_bl.c
 		2009-09-26 10:49:42 -07:00
..
acpica Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2009-09-23 09:32:11 -07:00
Kconfig Merge branch 'processor-procfs-2.6.32' into release 2009-09-19 02:10:40 -04:00
Makefile hwmon driver for ACPI 4.0 power meters 2009-09-19 01:30:01 -04:00
ac.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
acpi_memhotplug.c Merge branch 'bjorn-start-stop-2.6.32' into release 2009-09-19 01:56:39 -04:00
battery.c Merge branch 'battery' into release 2009-09-19 01:56:17 -04:00
blacklist.c Merge branch 'sfi-base' into release 2009-09-19 00:37:13 -04:00
bus.c ACPI: add acpi_bus_get_status_handle() 2009-09-25 14:24:30 -04:00
button.c Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel 2009-09-24 10:30:41 -07:00
cm_sbs.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
container.c Merge branch 'acpica' into release 2009-09-19 01:45:22 -04:00
debug.c acpi: switch /proc/acpi/{debug_layer,debug_level} to seq_file 2009-09-19 01:38:57 -04:00
dock.c Merge branch 'acpica' into release 2009-09-19 01:45:22 -04:00
ec.c Merge branch 'misc-2.6.32' into release 2009-09-19 02:14:45 -04:00
event.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
fan.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
glue.c Merge branch 'acpica' into release 2009-09-19 01:45:22 -04:00
internal.h ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
numa.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
osl.c ACPI: remove cpumask_t usage 2009-09-24 09:34:38 +09:30
pci_bind.c ACPI: kill acpi_get_pci_id 2009-06-17 23:32:23 -04:00
pci_irq.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
pci_link.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
pci_root.c Merge branch 'sfi-base' into release 2009-09-19 00:37:13 -04:00
pci_slot.c Merge branch 'misc-2.6.32' into release 2009-09-19 02:14:45 -04:00
power.c Merge branch 'sfi-base' into release 2009-09-19 00:37:13 -04:00
power_meter.c hwmon driver for ACPI 4.0 power meters 2009-09-19 01:30:01 -04:00
proc.c ACPI: convert acpi_device_lock spinlock to mutex 2009-04-07 00:02:40 -04:00
processor_core.c Merge branch 'processor-procfs-2.6.32' into release 2009-09-19 02:10:40 -04:00
processor_idle.c Merge branch 'processor-procfs-2.6.32' into release 2009-09-19 02:10:40 -04:00
processor_perflib.c cpumask: use zalloc_cpumask_var() where possible 2009-09-24 09:34:24 +09:30
processor_thermal.c Merge branch 'processor-procfs-2.6.32' into release 2009-09-19 02:10:40 -04:00
processor_throttling.c cpumask: use zalloc_cpumask_var() where possible 2009-09-24 09:34:24 +09:30
reboot.c ACPI: reboot.c: use new acpi_reset interface 2008-12-31 01:15:00 -05:00
sbs.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
sbshc.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
sbshc.h ACPI: SBS: Ignore alarms coming from unknown devices 2007-12-14 15:14:06 -05:00
scan.c ACPI: simplify building device HID/CID list 2009-09-25 15:09:49 -04:00
sleep.c Merge branch 'linus' into release 2009-09-19 00:06:59 -04:00
sleep.h ACPI: convert acpi_device_lock spinlock to mutex 2009-04-07 00:02:40 -04:00
system.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
tables.c ACPI: check acpi_disabled in acpi_table_parse() and acpi_table_parse_entries() 2009-08-28 19:57:28 -04:00
thermal.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
utils.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
video.c Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight 2009-09-26 10:49:42 -07:00
video_detect.c ACPI: Move definition of PREFIX from acpi_bus.h to internal..h 2009-08-28 19:57:27 -04:00
wakeup.c ACPI PM: Replace wakeup.prepared with reference counter 2009-09-09 14:19:18 -07:00