Merge branch 'misc' into release (88d998c2) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

88d998c2

Commit 88d998c2 authored 16 years ago by Len Brown

Downloads
- Plain Diff

Merge branch 'misc' into release

parents 79491ca4 d08ca2ca

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

arch/ia64/kernel/kprobes.c 1 addition, 1 deletion

arch/ia64/kernel/kprobes.c
arch/x86/kernel/kprobes.c 1 addition, 1 deletion

arch/x86/kernel/kprobes.c
drivers/acpi/Makefile 1 addition, 1 deletion

drivers/acpi/Makefile
drivers/acpi/sleep.c 0 additions, 0 deletions

drivers/acpi/sleep.c
drivers/misc/Makefile 0 additions, 1 deletion

drivers/misc/Makefile
drivers/platform/x86/Kconfig 12 additions, 0 deletions

drivers/platform/x86/Kconfig
drivers/platform/x86/Makefile 1 addition, 0 deletions

drivers/platform/x86/Makefile
drivers/platform/x86/dell-laptop.c 1 addition, 1 deletion

drivers/platform/x86/dell-laptop.c
drivers/platform/x86/eeepc-laptop.c 2 additions, 2 deletions

drivers/platform/x86/eeepc-laptop.c
include/acpi/actbl.h 1 addition, 1 deletion

include/acpi/actbl.h
kernel/kprobes.c 1 addition, 1 deletion

kernel/kprobes.c
kernel/power/Makefile 2 additions, 1 deletion

kernel/power/Makefile

with 23 additions and 10 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