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

edd84690

Commit edd84690 authored 16 years ago by Len Brown

Downloads
- Plain Diff

Merge branch 'acpi-modparam' into release


Conflicts:
	drivers/acpi/Makefile

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

parents 7c27fd19 ae7d5151

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

drivers/acpi/Makefile 26 additions, 20 deletions

drivers/acpi/Makefile
drivers/acpi/debug.c 0 additions, 5 deletions

drivers/acpi/debug.c
drivers/acpi/power.c 0 additions, 4 deletions

drivers/acpi/power.c
drivers/acpi/system.c 0 additions, 4 deletions

drivers/acpi/system.c

with 26 additions and 33 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