Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/ (dd504ea1) · Commits · SECO Northern Europe / Kernel / linux-guf · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-guf
- Activity
- Members
- Labels
- Terraform modules
- Model experiments

Snippets Groups Projects

dd504ea1

Commit dd504ea1 authored 17 years ago by Trond Myklebust

Downloads
- Plain Diff

Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

parents 5cf4cf65 0479ea0e

No related branches found

No related tags found

No related merge requests found

Changes 94

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/DocBook/kernel-locking.tmpl 78 additions, 45 deletions

Documentation/DocBook/kernel-locking.tmpl
Documentation/gpio.txt 6 additions, 2 deletions

Documentation/gpio.txt
Documentation/vm/slabinfo.c 12 additions, 5 deletions

Documentation/vm/slabinfo.c
MAINTAINERS 2 additions, 2 deletions

MAINTAINERS
arch/blackfin/Kconfig 0 additions, 8 deletions

arch/blackfin/Kconfig
arch/frv/Kconfig 0 additions, 8 deletions

arch/frv/Kconfig
arch/i386/kernel/cpu/mtrr/generic.c 1 addition, 1 deletion

arch/i386/kernel/cpu/mtrr/generic.c
arch/i386/kernel/cpu/mtrr/main.c 1 addition, 1 deletion

arch/i386/kernel/cpu/mtrr/main.c
arch/i386/kernel/smp.c 1 addition, 1 deletion

arch/i386/kernel/smp.c
arch/m68knommu/Kconfig 0 additions, 8 deletions

arch/m68knommu/Kconfig
arch/powerpc/platforms/cell/spufs/inode.c 1 addition, 3 deletions

arch/powerpc/platforms/cell/spufs/inode.c
arch/v850/Kconfig 0 additions, 8 deletions

arch/v850/Kconfig
drivers/acpi/numa.c 4 additions, 4 deletions

drivers/acpi/numa.c
drivers/mtd/ubi/eba.c 0 additions, 3 deletions

drivers/mtd/ubi/eba.c
drivers/rtc/Kconfig 3 additions, 3 deletions

drivers/rtc/Kconfig
drivers/rtc/rtc-omap.c 2 additions, 2 deletions

drivers/rtc/rtc-omap.c
drivers/serial/8250.c 18 additions, 3 deletions

drivers/serial/8250.c
drivers/serial/icom.c 31 additions, 24 deletions

drivers/serial/icom.c
drivers/video/console/vgacon.c 7 additions, 2 deletions

drivers/video/console/vgacon.c
fs/adfs/super.c 1 addition, 2 deletions

fs/adfs/super.c

with 168 additions and 135 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