Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

KED Linux Kernel Fork
- Activity
- Members
- Labels
- Model registry
- Model experiments

Snippets Groups Projects

57599cc9

Commit 57599cc9 authored 15 years ago by Len Brown

Downloads
- Plain Diff

Merge branch 'bjorn-notify' into release


Conflicts:
	drivers/platform/x86/eeepc-laptop.c

Signed-off-by: Len Brown <len.brown@intel.com>

parents fbe8cddd 586caae3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

drivers/acpi/ac.c 5 additions, 15 deletions

drivers/acpi/ac.c
drivers/acpi/battery.c 10 additions, 24 deletions

drivers/acpi/battery.c
drivers/acpi/bus.c 24 additions, 67 deletions

drivers/acpi/bus.c
drivers/platform/x86/asus-laptop.c 5 additions, 18 deletions

drivers/platform/x86/asus-laptop.c
drivers/platform/x86/asus_acpi.c 13 additions, 17 deletions

drivers/platform/x86/asus_acpi.c
drivers/platform/x86/eeepc-laptop.c 6 additions, 12 deletions

drivers/platform/x86/eeepc-laptop.c
include/acpi/acpi_bus.h 3 additions, 0 deletions

include/acpi/acpi_bus.h

with 66 additions and 153 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment