Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xcap-capability-linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

1d345dac

Commit 1d345dac authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

parents fb395884 87c8a443

No related branches found

No related tags found

Loading

Changes 224

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/DocBook/kernel-api.tmpl 0 additions, 1 deletion

Documentation/DocBook/kernel-api.tmpl
Documentation/driver-model/device.txt 8 additions, 0 deletions

Documentation/driver-model/device.txt
Documentation/driver-model/driver.txt 25 additions, 26 deletions

Documentation/driver-model/driver.txt
Documentation/filesystems/sysfs.txt 1 addition, 1 deletion

Documentation/filesystems/sysfs.txt
arch/arm/common/amba.c 1 addition, 1 deletion

arch/arm/common/amba.c
arch/arm/kernel/ecard.c 6 additions, 6 deletions

arch/arm/kernel/ecard.c
arch/arm26/kernel/ecard.c 5 additions, 5 deletions

arch/arm26/kernel/ecard.c
arch/i386/kernel/cpuid.c 11 additions, 11 deletions

arch/i386/kernel/cpuid.c
arch/i386/kernel/msr.c 11 additions, 11 deletions

arch/i386/kernel/msr.c
arch/ia64/sn/kernel/tiocx.c 11 additions, 14 deletions

arch/ia64/sn/kernel/tiocx.c
arch/parisc/kernel/drivers.c 1 addition, 1 deletion

arch/parisc/kernel/drivers.c
arch/ppc/kernel/pci.c 1 addition, 1 deletion

arch/ppc/kernel/pci.c
arch/ppc/syslib/ocp.c 1 addition, 1 deletion

arch/ppc/syslib/ocp.c
arch/ppc/syslib/of_device.c 1 addition, 1 deletion

arch/ppc/syslib/of_device.c
arch/ppc64/kernel/of_device.c 1 addition, 1 deletion

arch/ppc64/kernel/of_device.c
arch/ppc64/kernel/pci.c 1 addition, 1 deletion

arch/ppc64/kernel/pci.c
arch/ppc64/kernel/vio.c 2 additions, 2 deletions

arch/ppc64/kernel/vio.c
drivers/acpi/scan.c 2 additions, 2 deletions

drivers/acpi/scan.c
drivers/base/Makefile 2 additions, 2 deletions

drivers/base/Makefile
drivers/base/base.h 2 additions, 0 deletions

drivers/base/base.h

with 93 additions and 88 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