Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

751516f0

Commit 751516f0 authored 13 years ago by Len Brown

Downloads
- Plain Diff

Merge branch 'ec-cleanup' into release

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

parents 6288cf1e 08b53f0e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

drivers/acpi/ec.c 1 addition, 7 deletions

drivers/acpi/ec.c
drivers/platform/x86/compal-laptop.c 7 additions, 7 deletions

drivers/platform/x86/compal-laptop.c
drivers/platform/x86/msi-laptop.c 6 additions, 6 deletions

drivers/platform/x86/msi-laptop.c
include/linux/acpi.h 1 addition, 2 deletions

include/linux/acpi.h

with 15 additions and 22 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