diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-19 20:25:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-19 20:25:28 -0400 |
| commit | 2b858bd02ffca71391161f5709588fc70da79531 (patch) | |
| tree | 5652cdcc7c5307d4ebf2eb029e542b731a7243e5 /include/asm-sh/watchdog.h | |
| parent | 93cd791e02bbdb504aba024a14fdc07fe246bc71 (diff) | |
| parent | f3769e9db11df38c211881a5f11b2e38a8e4477a (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
pata_sis: Fix oops on boot
Diffstat (limited to 'include/asm-sh/watchdog.h')
0 files changed, 0 insertions, 0 deletions