redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity
remarkable-linux/drivers/acpi
History
Len Brown bd6dbdf3c7 When a merge does not work automatically, git prevents 
commit from running until a change has been made in
the destination.  In this instance the desired result
was to choose the destination version of the file
and ignore the source version, but git would not
allow that.

Here I added a blank line to let git commit think
I resolved a merge conflict.
2005-08-04 00:17:42 -04:00
..
dispatcher When a merge does not work automatically, git prevents 2005-08-04 00:17:42 -04:00
events [ACPI] ACPICA 20050729 from Bob Moore 2005-07-30 00:51:39 -04:00
executer [ACPI] ACPICA 20050729 from Bob Moore 2005-07-30 00:51:39 -04:00
hardware ACPICA 20050617-0624 from Bob Moore <robert.moore@intel.com> 2005-07-13 23:45:36 -04:00
namespace [ACPI] ACPICA 20050729 from Bob Moore 2005-07-30 00:51:39 -04:00
parser [ACPI] ACPICA 20050729 from Bob Moore 2005-07-30 00:51:39 -04:00
resources ACPICA from Bob Moore <robert.moore@intel.com> 2005-07-13 16:29:07 -04:00
sleep [ACPI] Deprecate /proc/acpi/sleep in favor of /sys/power/state 2005-07-12 00:05:03 -04:00
tables [ACPI] ACPICA 20050729 from Bob Moore 2005-07-30 00:51:39 -04:00
utilities [ACPI] ACPICA 20050729 from Bob Moore 2005-07-30 00:51:39 -04:00
ac.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
acpi_memhotplug.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
asus_acpi.c [ACPI] generic Hot Key support 2005-07-11 23:27:04 -04:00
battery.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
blacklist.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
bus.c [ACPI] pci_set_power_state() now calls 2005-07-11 23:47:06 -04:00
button.c [ACPI] restore /proc/acpi/button/ (ala 2.6.12) 2005-08-03 17:57:24 -04:00
container.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
debug.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
ec.c [ACPI] revert Embedded Controller to polling-mode by default (ala 2.6.12) 2005-08-03 17:40:43 -04:00
event.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
fan.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
glue.c [ACPI] quiet dmesg related to ACPI PM of PCI devices 2005-07-12 00:09:42 -04:00
hotkey.c [ACPI] CONFIG_ACPI_HOTKEY is now "n" by default 2005-08-03 18:11:22 -04:00
ibm_acpi.c [ACPI] Bind PCI devices with ACPI devices 2005-07-11 23:28:24 -04:00
Kconfig [ACPI] CONFIG_ACPI_HOTKEY is now "n" by default 2005-08-03 18:11:22 -04:00
Makefile [ACPI] Bind PCI devices with ACPI devices 2005-07-11 23:28:24 -04:00
motherboard.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
numa.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
osl.c ACPICA 20050617-0624 from Bob Moore <robert.moore@intel.com> 2005-07-13 23:45:36 -04:00
pci_bind.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pci_irq.c [ACPI] suspend/resume ACPI PCI Interrupt Links 2005-07-29 22:49:38 -04:00
pci_link.c [ACPI] PCI interrupt link suspend/resume - revert to 2.6.12 behaviour 2005-08-03 11:04:10 -04:00
pci_root.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
power.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
processor_core.c [ACPI] enable C2 and C3 idle power states on SMP 2005-07-12 00:14:36 -04:00
processor_idle.c [ACPI] fix 64-bit build warning in processor_idle.c 2005-08-03 00:23:45 -04:00
processor_perflib.c [ACPI] enable C2 and C3 idle power states on SMP 2005-07-12 00:14:36 -04:00
processor_thermal.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
processor_throttling.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
scan.c [ACPI] hotplug Processor consideration in acpi_bus_add() 2005-07-12 00:00:14 -04:00
system.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
tables.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
thermal.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
toshiba_acpi.c [ACPI] check for kmalloc failure in toshiba_acpi.c 2005-07-11 23:57:35 -04:00
utils.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
video.c [ACPI] fix kmalloc size bug in acpi/video.c 2005-07-11 23:58:45 -04:00