Auto merge with /home/aegl/GIT/linus (d18bfacf) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

d18bfacf

Commit d18bfacf authored 19 years ago by Tony Luck

Downloads
- Plain Diff

Auto merge with /home/aegl/GIT/linus

parents a68db763 fd782a4a

No related branches found

No related tags found

Loading

Changes 221

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/DocBook/libata.tmpl 93 additions, 3 deletions

Documentation/DocBook/libata.tmpl
Documentation/SubmittingDrivers 8 additions, 6 deletions

Documentation/SubmittingDrivers
Documentation/SubmittingPatches 29 additions, 15 deletions

Documentation/SubmittingPatches
Documentation/kernel-parameters.txt 15 additions, 0 deletions

Documentation/kernel-parameters.txt
Documentation/video4linux/API.html 16 additions, 399 deletions

Documentation/video4linux/API.html
Documentation/video4linux/CARDLIST.cx88 4 additions, 4 deletions

Documentation/video4linux/CARDLIST.cx88
Documentation/video4linux/CARDLIST.saa7134 6 additions, 0 deletions

Documentation/video4linux/CARDLIST.saa7134
Documentation/video4linux/CARDLIST.tuner 3 additions, 0 deletions

Documentation/video4linux/CARDLIST.tuner
Documentation/video4linux/README.saa7134 9 additions, 0 deletions

Documentation/video4linux/README.saa7134
MAINTAINERS 8 additions, 7 deletions

MAINTAINERS
Makefile 2 additions, 2 deletions

Makefile
arch/arm/Kconfig 5 additions, 0 deletions

arch/arm/Kconfig
arch/arm/mach-s3c2410/irq.c 4 additions, 3 deletions

arch/arm/mach-s3c2410/irq.c
arch/arm/oprofile/Makefile 1 addition, 1 deletion

arch/arm/oprofile/Makefile
arch/arm/oprofile/backtrace.c 144 additions, 0 deletions

arch/arm/oprofile/backtrace.c
arch/arm/oprofile/init.c 2 additions, 0 deletions

arch/arm/oprofile/init.c
arch/arm/oprofile/op_arm_model.h 2 additions, 0 deletions

arch/arm/oprofile/op_arm_model.h
arch/i386/boot/tools/build.c 2 additions, 1 deletion

arch/i386/boot/tools/build.c
arch/i386/kernel/acpi/boot.c 49 additions, 8 deletions

arch/i386/kernel/acpi/boot.c
arch/i386/pci/common.c 6 additions, 2 deletions

arch/i386/pci/common.c

with 408 additions and 451 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