diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 00:43:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 00:43:09 +0200 |
commit | c0d6f9663b30a09ed725229b2d50391268c8538e (patch) | |
tree | 7ba471cf9632097682ab55689cd64c9a68e11235 /drivers/char/watchdog/ixp2000_wdt.c | |
parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
parent | [I2C] Clean up i2c-pxa debugging/printks (diff) | |
download | linux-c0d6f9663b30a09ed725229b2d50391268c8538e.tar.xz linux-c0d6f9663b30a09ed725229b2d50391268c8538e.zip |
Merge master.kernel.org:/home/rmk/linux-2.6-i2c manually
Old tree, so the automatic merge had some problems.
Diffstat (limited to 'drivers/char/watchdog/ixp2000_wdt.c')
0 files changed, 0 insertions, 0 deletions