diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 15:00:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 15:00:45 +0200 |
| commit | 67d2c36e901403bb97cb79ddb44d702c3284d0ba (patch) | |
| tree | 872805a9402f8186584075f1a8cf804b9606efea /drivers/i2c/busses/i2c-amd8111.c | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| parent | [WATCHDOG] softdog-timer-running-oops.patch (diff) | |
| download | linux-67d2c36e901403bb97cb79ddb44d702c3284d0ba.tar.xz linux-67d2c36e901403bb97cb79ddb44d702c3284d0ba.zip | |
Merge watchdog driver updates
Automated merge from
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
failed due to duplicate different changes to Kconfig file. Manually fixed
up. Hopefully.
Diffstat (limited to 'drivers/i2c/busses/i2c-amd8111.c')
0 files changed, 0 insertions, 0 deletions