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

a8cd2e50

Commit a8cd2e50 authored 19 years ago by Linus Torvalds

Downloads
- Plain Diff

Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

parents 0160f53e c315b7e8

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

drivers/char/watchdog/Kconfig 72 additions, 21 deletions

drivers/char/watchdog/Kconfig
drivers/char/watchdog/Makefile 6 additions, 1 deletion

drivers/char/watchdog/Makefile
drivers/char/watchdog/i6300esb.c 527 additions, 0 deletions

drivers/char/watchdog/i6300esb.c
drivers/char/watchdog/ibmasr.c 405 additions, 0 deletions

drivers/char/watchdog/ibmasr.c
drivers/char/watchdog/mv64x60_wdt.c 252 additions, 0 deletions

drivers/char/watchdog/mv64x60_wdt.c
drivers/char/watchdog/pcwd_pci.c 24 additions, 20 deletions

drivers/char/watchdog/pcwd_pci.c
drivers/char/watchdog/s3c2410_wdt.c 1 addition, 1 deletion

drivers/char/watchdog/s3c2410_wdt.c
drivers/char/watchdog/sbc8360.c 414 additions, 0 deletions

drivers/char/watchdog/sbc8360.c
drivers/char/watchdog/w83977f_wdt.c 543 additions, 0 deletions

drivers/char/watchdog/w83977f_wdt.c
include/asm-ppc/mv64x60.h 8 additions, 0 deletions

include/asm-ppc/mv64x60.h

with 2252 additions and 43 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